[pypy-svn] r28090 - in pypy/dist/pypy/rpython: . lltypesystem ootypesystem

[antocuni at codespeak.net]

Author: antocuni
Date: Fri Jun  2 14:03:20 2006
New Revision: 28090

Modified:
   pypy/dist/pypy/rpython/lltypesystem/rdict.py
   pypy/dist/pypy/rpython/ootypesystem/rdict.py
   pypy/dist/pypy/rpython/rdict.py
Log:
(antocuni, nikh)

Don't use externalvsinternal repr distinction in ootypesystem because
it's not needed.



Modified: pypy/dist/pypy/rpython/lltypesystem/rdict.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rdict.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/rdict.py	Fri Jun  2 14:03:20 2006
@@ -60,6 +60,9 @@
         self._custom_eq_hash_repr = custom_eq_hash
         # setup() needs to be called to finish this initialization
 
+    def _externalvsinternal(self, rtyper, item_repr):
+        return rmodel.externalvsinternal(self.rtyper, item_repr)
+
     def _setup_repr(self):
         if 'key_repr' not in self.__dict__:
             key_repr = self._key_repr_computer()

Modified: pypy/dist/pypy/rpython/ootypesystem/rdict.py
==============================================================================
--- pypy/dist/pypy/rpython/ootypesystem/rdict.py	(original)
+++ pypy/dist/pypy/rpython/ootypesystem/rdict.py	Fri Jun  2 14:03:20 2006
@@ -44,6 +44,9 @@
         self._custom_eq_hash_repr = custom_eq_hash
         # setup() needs to be called to finish this initialization
 
+    def _externalvsinternal(self, rtyper, item_repr):
+        return item_repr, item_repr
+
     def _setup_repr(self):
         if 'key_repr' not in self.__dict__:
             key_repr = self._key_repr_computer()

Modified: pypy/dist/pypy/rpython/rdict.py
==============================================================================
--- pypy/dist/pypy/rpython/rdict.py	(original)
+++ pypy/dist/pypy/rpython/rdict.py	Fri Jun  2 14:03:20 2006
@@ -49,7 +49,7 @@
         if self.custom_eq_hash:
             return item_repr, item_repr
         else:
-            return rmodel.externalvsinternal(self.rtyper, item_repr)
+            return self._externalvsinternal(self.rtyper, item_repr)
 
     def pickkeyrepr(self, key_repr):
         external, internal = self.pickrepr(key_repr)