Author: Wim Lavrijsen <wlavrij...@lbl.gov>
Branch: reflex-support
Changeset: r59339:4882fbb71e92
Date: 2012-12-05 17:23 -0800
http://bitbucket.org/pypy/pypy/changeset/4882fbb71e92/
Log: merge default into branch
diff --git a/pypy/doc/windows.rst b/pypy/doc/windows.rst
--- a/pypy/doc/windows.rst
+++ b/pypy/doc/windows.rst
@@ -13,8 +13,8 @@
Translating PyPy with Visual Studio
-----------------------------------
-We routinely test the `RPython translation toolchain`_ using Visual Studio .NET
-2005, Professional Edition, and Visual Studio .NET 2008, Express
+We routinely test the `RPython translation toolchain`_ using
+Visual Studio 2008, Express
Edition. Other configurations may work as well.
The translation scripts will set up the appropriate environment variables
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
