[pypy-svn] r23803 - in pypy/dist/pypy/rpython: rctypes test

[goden at codespeak.net]

Author: goden
Date: Wed Mar  1 01:52:32 2006
New Revision: 23803

Modified:
   pypy/dist/pypy/rpython/rctypes/implementation.py
   pypy/dist/pypy/rpython/test/test_extregistry.py
Log:
- (arigo, micktwomey, goden) replaced "from pypy.rpython.extregistry import ..." with "from pypy.rpython import extregistry"



Modified: pypy/dist/pypy/rpython/rctypes/implementation.py
==============================================================================
--- pypy/dist/pypy/rpython/rctypes/implementation.py	(original)
+++ pypy/dist/pypy/rpython/rctypes/implementation.py	Wed Mar  1 01:52:32 2006
@@ -16,8 +16,7 @@
         Void
 from pypy.rpython.rmodel import Repr, IntegerRepr, inputconst
 from pypy.rpython.error import TyperError
-from pypy.rpython.extregistry import register_value, register_metatype, \
-    register_type, is_registered_type, lookup_type
+from pypy.rpython import extregistry
 from pypy.annotation.pairtype import pairtype
 from pypy.rpython import rint
 
@@ -70,10 +69,10 @@
             # no 'wrap_arg'. This might change in the future
             #the_type.compute_result_annotation = classmethod(lambda cls, s_arg:SomeCTypesObject(cls))
             def do_register(the_type):
-                register_value(the_type, 
+                extregistry.register_value(the_type, 
                 compute_result_annotation=lambda s_arg: SomeCTypesObject(the_type))
                 # XXX we need to register the correct repr for each primitive
-                register_type(the_type,
+                extregistry.register_type(the_type,
                     get_repr=lambda rtyper, s_primitive: rint.signed_repr)
             do_register(the_type)
             the_type.default_memorystate = SomeCTypesObject.NOMEMORY
@@ -133,7 +132,7 @@
             _callable=None,
             convert_params = convert_params ) 
 
-register_metatype(CFuncPtrType, 
+extregistry.register_metatype(CFuncPtrType, 
     compute_annotation=cfuncptrtype_compute_annotation,
     specialize_call=cfuncptrtype_specialize_call)
 
@@ -498,8 +497,8 @@
         
 class __extend__( SomeCTypesObject ):
     def rtyper_makerepr( self, rtyper ):
-        if is_registered_type(self.knowntype):
-            entry = lookup_type(self.knowntype)
+        if extregistry.is_registered_type(self.knowntype):
+            entry = extregistry.lookup_type(self.knowntype)
             return entry.get_repr(rtyper, self)
         return self.knowntype.createLowLevelRepresentation( rtyper, self )
         

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	Wed Mar  1 01:52:32 2006
@@ -2,10 +2,7 @@
 
 ##py.test.skip('In progress at PyCon')
 
-from pypy.rpython.extregistry import EXT_REGISTRY_BY_VALUE, EXT_REGISTRY_BY_TYPE
-from pypy.rpython.extregistry import register_value, register_type
-from pypy.rpython.extregistry import register_metatype
-from pypy.rpython.extregistry import lookup_type
+from pypy.rpython import extregistry
 from pypy.annotation import model as annmodel
 from pypy.annotation.annrpython import RPythonAnnotator
 from pypy.translator.translator import TranslationContext
@@ -16,7 +13,8 @@
 def dummy(): 
     raiseNameError
 
-register_value(dummy, compute_result_annotation=annmodel.SomeInteger())
+extregistry.register_value(dummy,
+        compute_result_annotation=annmodel.SomeInteger())
 
 def test_call_dummy():
     def func():
@@ -34,7 +32,8 @@
     def return_annotation():
         return annmodel.SomeInteger()
     
-    register_value(dummy2, compute_result_annotation=return_annotation)
+    extregistry.register_value(dummy2,
+            compute_result_annotation=return_annotation)
     
     def func():
         x = dummy2()
@@ -57,7 +56,7 @@
         assert instance is dummy_type
         return annmodel.SomeInteger()
     
-    register_type(DummyType, compute_annotation=get_annotation)
+    extregistry.register_type(DummyType, compute_annotation=get_annotation)
     
     a = RPythonAnnotator()
     s = a.build_types(func, [])
@@ -80,7 +79,7 @@
         assert x is real_class
         return annmodel.SomeInteger()
     
-    register_metatype(MetaType, compute_annotation=get_annotation)
+    extregistry.register_metatype(MetaType, compute_annotation=get_annotation)
     
     a = RPythonAnnotator()
     s = a.build_types(func, [])
@@ -101,7 +100,7 @@
         assert x is None
         return annmodel.SomeInteger()
     
-    register_metatype(MetaType, compute_annotation=get_annotation)
+    extregistry.register_metatype(MetaType, compute_annotation=get_annotation)
     
     a = RPythonAnnotator()
     s = a.build_types(func, [RealClass])
@@ -114,7 +113,7 @@
     def dummy_specialize(hop):
         return hop.inputconst(lltype.Signed, 42)
     
-    register_value(dummy_func, 
+    extregistry.register_value(dummy_func, 
         compute_result_annotation=annmodel.SomeInteger(), 
         specialize_call=dummy_specialize)
     
@@ -131,7 +130,7 @@
     
     class SomeDummyObject(annmodel.SomeObject):
         def rtyper_makerepr(self, rtyper):
-            entry = lookup_type(self.knowntype)
+            entry = extregistry.lookup_type(self.knowntype)
             return entry.get_repr(rtyper, self)
             
         def rtyper_makekey( self ):
@@ -152,7 +151,7 @@
     def get_repr(rtyper, s_instance):
         return DummyRepr()
     
-    register_type(DummyClass, compute_annotation=get_annotation,
+    extregistry.register_type(DummyClass, compute_annotation=get_annotation,
         get_repr=get_repr)
     
     dummy_class = DummyClass()
@@ -163,4 +162,4 @@
     res = interpret(func, [])
     
     assert res == 42
-    
\ No newline at end of file
+