[pypy-commit] pypy py3k: Fix checkmodule.py, and run it on the thread module.

amauryfa noreply at buildbot.pypy.org
Sat Jan 14 21:48:34 CET 2012

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3k
Changeset: r51324:65597104c440
Date: 2011-12-26 18:39 +0100

Log:	Fix checkmodule.py, and run it on the thread module.

diff --git a/pypy/module/thread/os_lock.py b/pypy/module/thread/os_lock.py
--- a/pypy/module/thread/os_lock.py
+++ b/pypy/module/thread/os_lock.py
@@ -8,7 +8,7 @@
 from pypy.interpreter.gateway import interp2app, unwrap_spec
 from pypy.interpreter.typedef import TypeDef, make_weakref_descr
 from pypy.interpreter.error import OperationError
-from pypy.rlib.rarithmetic import r_longlong, r_uint, ovfcheck
+from pypy.rlib.rarithmetic import r_longlong, ovfcheck
 # Force the declaration of the type 'thread.LockType' for RPython
 #import pypy.module.thread.rpython.exttable
@@ -212,7 +212,7 @@
             return space.w_False
-    @unwrap_spec(count=r_uint, owner=int)
+    @unwrap_spec(count=int, owner=int)
     def acquire_restore_w(self, space, count, owner):
         """For internal use by `threading.Condition`."""
         r = True
diff --git a/pypy/objspace/fake/objspace.py b/pypy/objspace/fake/objspace.py
--- a/pypy/objspace/fake/objspace.py
+++ b/pypy/objspace/fake/objspace.py
@@ -267,7 +267,7 @@
                  ObjSpace.ExceptionTable +
                  ['int', 'str', 'float', 'long', 'tuple', 'list',
                   'dict', 'unicode', 'complex', 'slice', 'bool',
-                  'type', 'basestring']):
+                  'type', 'text']):
         setattr(FakeObjSpace, 'w_' + name, w_some_obj())
     for (name, _, arity, _) in ObjSpace.MethodTable:

More information about the pypy-commit mailing list