[Python-3000-checkins] r62086 - in python/branches/py3k: Lib/lib2to3 Lib/lib2to3/tests/test_fixers.py Lib/test/test_mmap.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Tue Apr  1 08:17:46 2008
New Revision: 62086

Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/lib2to3/   (props changed)
   python/branches/py3k/Lib/lib2to3/tests/test_fixers.py
   python/branches/py3k/Lib/test/test_mmap.py
Log:
Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62055-62058,62060-62066,62068-62074,62076-62085 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

................
  r62080 | martin.v.loewis | 2008-03-31 07:20:55 +0200 (Mo, 31 Mär 2008) | 9 lines
  
  Merged revisions 61990-62079 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
  
  ........
    r62017 | david.wolever | 2008-03-28 21:54:37 +0100 (Fr, 28 Mär 2008) | 1 line
    
    Fixed an out-of-date comment.
  ........
................
  r62084 | benjamin.peterson | 2008-03-31 23:57:13 +0200 (Mo, 31 Mär 2008) | 2 lines
  
  PyErr_Warn is decrepated. Use PyErr_WarnEx
................
  r62085 | neal.norwitz | 2008-04-01 07:40:43 +0200 (Di, 01 Apr 2008) | 4 lines
  
  Be sure to close the file.  2 places were deleting the file, so it was probably
  fine, but the last change may be required for the test to pass on Windows.
  Should we always close the mmap too?
................


Modified: python/branches/py3k/Lib/lib2to3/tests/test_fixers.py
==============================================================================
--- python/branches/py3k/Lib/lib2to3/tests/test_fixers.py	(original)
+++ python/branches/py3k/Lib/lib2to3/tests/test_fixers.py	Tue Apr  1 08:17:46 2008
@@ -3139,7 +3139,7 @@
 
     def setUp(self):
         FixerTestCase.setUp(self)
-        # Need to replace fix_import's isfile and isdir method
+        # Need to replace fix_import's exists method
         # so we can check that it's doing the right thing
         self.files_checked = []
         self.always_exists = True

Modified: python/branches/py3k/Lib/test/test_mmap.py
==============================================================================
--- python/branches/py3k/Lib/test/test_mmap.py	(original)
+++ python/branches/py3k/Lib/test/test_mmap.py	Tue Apr  1 08:17:46 2008
@@ -158,6 +158,7 @@
             pass
         else:
             self.fail("Able to resize readonly memory map")
+        f.close()
         del m, f
         self.assertEqual(open(TESTFN, "rb").read(), b'a'*mapsize,
                "Readonly memory map data file was modified")
@@ -214,6 +215,7 @@
                "Copy-on-write test data file should not be modified.")
         # Ensuring copy-on-write maps cannot be resized
         self.assertRaises(TypeError, m.resize, 2*mapsize)
+        f.close()
         del m, f
 
         # Ensuring invalid access parameter raises exception
@@ -433,7 +435,7 @@
         f = open(TESTFN, "rb")
         m = mmap.mmap(f.fileno(), mapsize, prot=mmap.PROT_READ)
         self.assertRaises(TypeError, m.write, "foo")
-
+        f.close()
 
     def test_error(self):
         self.assert_(issubclass(mmap.error, EnvironmentError))