[Python-checkins] r88036 - in python/branches/py3k: Lib/test/test_mmap.py Modules/mmapmodule.c

Sat Jan 15 18:25:58 CET 2011

Author: antoine.pitrou
Date: Sat Jan 15 18:25:58 2011
New Revision: 88036
Log:
Fix mmap and test_mmap under Windows too (followup to r88022)
Modified:
 python/branches/py3k/Lib/test/test_mmap.py
 python/branches/py3k/Modules/mmapmodule.c
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	Sat Jan 15 18:25:58 2011
@@ -325,13 +325,14 @@
 # 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()
+ with mmap.mmap(f.fileno(), 0, offset=65536, access=mmap.ACCESS_READ) as mf:
+ self.assertRaises(IndexError, mf.__getitem__, 80000)
 
 def test_move(self):
 # make move works everywhere (64-bit format problem earlier)
Modified: python/branches/py3k/Modules/mmapmodule.c
==============================================================================
--- python/branches/py3k/Modules/mmapmodule.c	(original)
+++ python/branches/py3k/Modules/mmapmodule.c	Sat Jan 15 18:25:58 2011
@@ -1300,6 +1300,7 @@
 else
 m_obj->size = low;
 #endif
+ m_obj->size -= offset;
 } else {
 m_obj->size = map_size;
 }
