[pypy-commit] pypy buffer-interface2: fix tests, cleanup

mattip pypy.commits at gmail.com
Wed Oct 5 00:26:44 EDT 2016


Author: Matti Picus <matti.picus at gmail.com>
Branch: buffer-interface2
Changeset: r87585:ab677b06fa22
Date: 2016-10-05 07:25 +0300
http://bitbucket.org/pypy/pypy/changeset/ab677b06fa22/

Log:	fix tests, cleanup

diff --git a/pypy/module/cpyext/pyerrors.py b/pypy/module/cpyext/pyerrors.py
--- a/pypy/module/cpyext/pyerrors.py
+++ b/pypy/module/cpyext/pyerrors.py
@@ -150,12 +150,12 @@
     Return value: always NULL."""
     # XXX Doesn't actually do anything with PyErr_CheckSignals.
     if llfilename:
-        w_filename = rffi.charp2str(llfilename)
-        filename = space.newbytes(w_filename)
+        filename = rffi.charp2str(llfilename)
+        w_filename = space.newbytes(filename)
     else:
-        filename = space.w_None
+        w_filename = space.w_None
 
-    PyErr_SetFromErrnoWithFilenameObject(space, w_type, filename)
+    PyErr_SetFromErrnoWithFilenameObject(space, w_type, w_filename)
 
 @cpython_api([PyObject, PyObject], PyObject)
 @jit.dont_look_inside       # direct use of _get_errno()
diff --git a/pypy/module/cpyext/test/test_arraymodule.py b/pypy/module/cpyext/test/test_arraymodule.py
--- a/pypy/module/cpyext/test/test_arraymodule.py
+++ b/pypy/module/cpyext/test/test_arraymodule.py
@@ -2,15 +2,16 @@
 from pypy.conftest import option
 
 class AppTestArrayModule(AppTestCpythonExtensionBase):
+    enable_leak_checking = True
 
     def setup_class(cls):
         from rpython.tool.udir import udir
+        AppTestCpythonExtensionBase.setup_class.im_func(cls)
         if option.runappdirect:
             cls.w_udir = str(udir)
         else:
             cls.w_udir = cls.space.wrap(str(udir))
 
-    #enable_leak_checking = False
 
     def test_basic(self):
         module = self.import_module(name='array')


More information about the pypy-commit mailing list