[pypy-svn] r72496 - in pypy/trunk/pypy/module/cpyext: . test

[xoraxax at codespeak.net]

Author: xoraxax
Date: Sun Mar 21 17:24:16 2010
New Revision: 72496

Modified:
   pypy/trunk/pypy/module/cpyext/modsupport.py
   pypy/trunk/pypy/module/cpyext/test/test_typeobject.py
Log:
Fix wrapping bug.

Modified: pypy/trunk/pypy/module/cpyext/modsupport.py
==============================================================================
--- pypy/trunk/pypy/module/cpyext/modsupport.py	(original)
+++ pypy/trunk/pypy/module/cpyext/modsupport.py	Sun Mar 21 17:24:16 2010
@@ -26,8 +26,8 @@
     modname = rffi.charp2str(name)
     w_mod = PyImport_AddModule(space, modname)
     dict_w = convert_method_defs(space, methods)
-    for w_key, w_value in dict_w.items():
-        space.setattr(w_mod, w_key, w_value)
+    for key, w_value in dict_w.items():
+        space.setattr(w_mod, space.wrap(key), w_value)
     return w_mod
 
 
@@ -43,7 +43,7 @@
             methodname = rffi.charp2str(method.c_ml_name)
             flags = method.c_ml_flags
             w_function = PyCFunction_NewEx(space, method, None)
-            dict_w[space.wrap(methodname)] = w_function
+            dict_w[methodname] = w_function
             i = i + 1
     return dict_w
 

Modified: pypy/trunk/pypy/module/cpyext/test/test_typeobject.py
==============================================================================
--- pypy/trunk/pypy/module/cpyext/test/test_typeobject.py	(original)
+++ pypy/trunk/pypy/module/cpyext/test/test_typeobject.py	Sun Mar 21 17:24:16 2010
@@ -9,7 +9,7 @@
         import sys
         module = self.import_module(name='foo')
         assert 'foo' in sys.modules
-        print module.fooType
+        assert "copy" in dir(module.fooType)
         obj = module.new()
         print "Obj has type", type(obj)
         assert type(obj) is module.fooType