Merged revisions 88036 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88036 | antoine.pitrou | 2011-01-15 18:25:58 +0100 (sam., 15 janv. 2011) | 3 lines

  Fix mmap and test_mmap under Windows too (followup to r88022)
........

diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
index 5f540c0749b6ea053d2720aa9c46db44173be0c7..20ec56466fd6c1396a530966646c49da019efb7c 100644 (file)
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -331,13 +331,17 @@ class MmapTests(unittest.TestCase):
         # map length with an offset doesn't cause a segfault.
         if not hasattr(os, "stat"):
             self.skipTest("needs os.stat")
-        with open(TESTFN, "wb+") as f:
-            f.write(49152 * b'm') # Arbitrary character
+        # NOTE: allocation granularity is currently 65536 under Win64,
+        # and therefore the minimum offset alignment.
+        with open(TESTFN, "wb") as f:
+            f.write((65536 * 2) * b'm') # Arbitrary character
 
         with open(TESTFN, "rb") as f:
-            mf = mmap.mmap(f.fileno(), 0, offset=40960, access=mmap.ACCESS_READ)
-            self.assertRaises(IndexError, mf.__getitem__, 45000)
-            mf.close()
+            mf = mmap.mmap(f.fileno(), 0, offset=65536, access=mmap.ACCESS_READ)
+            try:
+                self.assertRaises(IndexError, mf.__getitem__, 80000)
+            finally:
+                mf.close()
 
     def test_move(self):
         # make move works everywhere (64-bit format problem earlier)

diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index 6ca95c95f9e9cdb5e3190f692fd28ac0cfb99df0..0e91f2c067d0b66603ce7018776162557401772c 100644 (file)
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1346,6 +1346,7 @@ new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict)
             else
                 m_obj->size = low;
 #endif
+            m_obj->size -= offset;
         } else {
             m_obj->size = map_size;
         }