[pypy-svn] r31131 - in pypy/dist/pypy/rpython: . test

[arigo at codespeak.net]

Author: arigo
Date: Mon Aug  7 18:28:57 2006
New Revision: 31131

Modified:
   pypy/dist/pypy/rpython/extregistry.py
   pypy/dist/pypy/rpython/test/test_extregistry.py
Log:
Fix test_extregistry failures - my fault.


Modified: pypy/dist/pypy/rpython/extregistry.py
==============================================================================
--- pypy/dist/pypy/rpython/extregistry.py	(original)
+++ pypy/dist/pypy/rpython/extregistry.py	Mon Aug  7 18:28:57 2006
@@ -19,7 +19,7 @@
             del selfcls._metatype_
 
     def _register_value(selfcls, key):
-        if isinstance(key, (tuple, list)):
+        if isinstance(key, tuple):
             for k in key:
                 selfcls._register_value(k)
         else:
@@ -27,7 +27,7 @@
             EXT_REGISTRY_BY_VALUE[key] = selfcls
 
     def _register_type(selfcls, key):
-        if isinstance(key, (tuple, list)):
+        if isinstance(key, tuple):
             for k in key:
                 selfcls._register_type(k)
         else:
@@ -35,7 +35,7 @@
             EXT_REGISTRY_BY_TYPE[key] = selfcls
 
     def _register_metatype(selfcls, key):
-        if isinstance(key, (tuple, list)):
+        if isinstance(key, tuple):
             for k in key:
                 selfcls._register_metatype(k)
         else:

Modified: pypy/dist/pypy/rpython/test/test_extregistry.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_extregistry.py	(original)
+++ pypy/dist/pypy/rpython/test/test_extregistry.py	Mon Aug  7 18:28:57 2006
@@ -1,6 +1,4 @@
-import py
-
-##py.test.skip('In progress at PyCon')
+import py, sys
 
 from pypy.rpython import extregistry
 from pypy.rpython.extregistry import ExtRegistryEntry
@@ -172,10 +170,10 @@
     assert isinstance(extregistry.lookup(lst1), Entry)
     py.test.raises(KeyError, "extregistry.lookup(lst2)")
 
-def test_register_non_weakly_refable(n=6):
-    tup1 = (5, 6)
-    tup2 = (5, n)
-    class Entry(ExtRegistryEntry):
-        _about_ = tup1
-    assert isinstance(extregistry.lookup(tup1), Entry)
-    assert isinstance(extregistry.lookup(tup2), Entry)
+def test_register_non_weakly_refable():
+    n1 = sys.maxint // 2
+    n2 = sys.maxint // 2
+    class Entry(ExtRegistryEntry):
+        _about_ = n1
+    assert isinstance(extregistry.lookup(n1), Entry)
+    assert isinstance(extregistry.lookup(n2), Entry)