[pypy-commit] pypy win32-stdlib: fix merge

mattip noreply at buildbot.pypy.org
Sun Jun 10 23:21:29 CEST 2012


Author: mattip <matti.picus at gmail.com>
Branch: win32-stdlib
Changeset: r55564:12fd35445d42
Date: 2012-06-11 00:11 +0300
http://bitbucket.org/pypy/pypy/changeset/12fd35445d42/

Log:	fix merge

diff --git a/pypy/module/_ffi/test/test_funcptr.py b/pypy/module/_ffi/test/test_funcptr.py
--- a/pypy/module/_ffi/test/test_funcptr.py
+++ b/pypy/module/_ffi/test/test_funcptr.py
@@ -40,7 +40,7 @@
         space = gettestobjspace(usemodules=('_ffi', '_rawffi'))
         cls.space = space
         cls.w_iswin32 = space.wrap(sys.platform == 'win32')
-        cls.w_libfoo_name = space.wrap(cls.prepare_c_example()) 
+        cls.w_libfoo_name = space.wrap(cls.prepare_c_example())
         cls.w_libc_name = space.wrap(get_libc_name())
         libm_name = get_libm_name(sys.platform)
         cls.w_libm_name = space.wrap(libm_name)


More information about the pypy-commit mailing list