Author: Amaury Forgeot d'Arc <amaur...@gmail.com>
Branch: py3k
Changeset: r59334:c61df215856c
Date: 2012-12-05 21:27 +0100
http://bitbucket.org/pypy/pypy/changeset/c61df215856c/
Log: hg merge default
diff --git a/pypy/module/bz2/test/test_bz2_file.py
b/pypy/module/bz2/test/test_bz2_file.py
--- a/pypy/module/bz2/test/test_bz2_file.py
+++ b/pypy/module/bz2/test/test_bz2_file.py
@@ -65,7 +65,10 @@
cls.w_DATA_CRLF = cls.space.wrapbytes(DATA_CRLF)
cls.w_temppath = cls.space.wrap(
str(py.test.ensuretemp("bz2").join("foo")))
- cls.w_create_temp_file = cls.space.wrap(interp2app(create_temp_file))
+ if cls.runappdirect:
+ cls.w_create_temp_file = create_temp_file
+ else:
+ cls.w_create_temp_file =
cls.space.wrap(interp2app(create_temp_file))
cls.w_decompress = cls.space.wrap(interp2app(decompress))
cls.w_create_broken_temp_file =
cls.space.wrap(interp2app(create_broken_temp_file))
cls.w_random_data = cls.space.wrapbytes(RANDOM_DATA)
diff --git a/pypy/module/cpyext/test/test_getargs.py
b/pypy/module/cpyext/test/test_getargs.py
--- a/pypy/module/cpyext/test/test_getargs.py
+++ b/pypy/module/cpyext/test/test_getargs.py
@@ -3,16 +3,10 @@
from pypy.module.cpyext.test.test_cpyext import AppTestCpythonExtensionBase
class AppTestGetargs(AppTestCpythonExtensionBase):
- def setup_method(self, func):
- super(AppTestGetargs, self).setup_method(func)
- self.w_import_parser = self.space.wrap(self.import_parser)
-
-
- def import_parser(self, implementation, argstyle='METH_VARARGS'):
+ def w_import_parser(self, implementation, argstyle='METH_VARARGS'):
mod = self.import_extension(
'modname', [('funcname', argstyle, implementation)])
- return self.space.getattr(mod, self.space.wrap("funcname"))
-
+ return mod.funcname
def test_pyarg_parse_int(self):
"""
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
