[Python-checkins] r60202 - in python/trunk: Lib/test/test_mmap.py Modules/mmapmodule.c

[georg.brandl]

Author: georg.brandl
Date: Tue Jan 22 20:56:03 2008
New Revision: 60202

Modified:
   python/trunk/Lib/test/test_mmap.py
   python/trunk/Modules/mmapmodule.c
Log:
Fix for #1087741 patch.


Modified: python/trunk/Lib/test/test_mmap.py
==============================================================================
--- python/trunk/Lib/test/test_mmap.py	(original)
+++ python/trunk/Lib/test/test_mmap.py	Tue Jan 22 20:56:03 2008
@@ -420,6 +420,13 @@
             except OSError:
                 pass
 
+    def test_subclass(self):
+        class anon_mmap(mmap.mmap):
+            def __new__(klass, *args, **kwargs):
+                return mmap.mmap.__new__(klass, -1, *args, **kwargs)
+        anon_mmap(PAGESIZE)
+
+
 def test_main():
     run_unittest(MmapTests)
 

Modified: python/trunk/Modules/mmapmodule.c
==============================================================================
--- python/trunk/Modules/mmapmodule.c	(original)
+++ python/trunk/Modules/mmapmodule.c	Tue Jan 22 20:56:03 2008
@@ -129,7 +129,7 @@
 	}
 #endif /* UNIX */
 
-	PyObject_Del(m_obj);
+	m_obj->ob_type->tp_free((PyObject*)m_obj);
 }
 
 static PyObject *