[pypy-svn] r20265 - in pypy/branch/somepbc-refactoring/pypy/rpython: . lltypesystem

[pedronis at codespeak.net]

Author: pedronis
Date: Sat Nov 26 02:36:05 2005
New Revision: 20265

Modified:
   pypy/branch/somepbc-refactoring/pypy/rpython/lltypesystem/rclass.py
   pypy/branch/somepbc-refactoring/pypy/rpython/rclass.py
Log:
kill some more usages of classdef.cls 



Modified: pypy/branch/somepbc-refactoring/pypy/rpython/lltypesystem/rclass.py
==============================================================================
--- pypy/branch/somepbc-refactoring/pypy/rpython/lltypesystem/rclass.py	(original)
+++ pypy/branch/somepbc-refactoring/pypy/rpython/lltypesystem/rclass.py	Sat Nov 26 02:36:05 2005
@@ -355,7 +355,7 @@
             # instance of a subclass and delegate to that InstanceRepr
             if classdef.commonbase(self.classdef) != self.classdef:
                 raise TyperError("not an instance of %r: %r" % (
-                    self.classdef.cls, value))
+                    self.classdef.name, value))
             rinstance = getinstancerepr(self.rtyper, classdef)
             result = rinstance.convert_const(value)
             return cast_pointer(self.lowleveltype, result)
@@ -375,7 +375,7 @@
     def get_ll_hash_function(self):
         if self.classdef is None:
             return None
-        if self.rtyper.needs_hash_support( self.classdef.cls):
+        if self.rtyper.needs_hash_support(self.classdef):
             try:
                 return self._ll_hash_function
             except AttributeError:
@@ -490,7 +490,7 @@
     def rtype_hash(self, hop):
         if self.classdef is None:
             raise TyperError, "hash() not supported for this class"                        
-        if self.rtyper.needs_hash_support( self.classdef.cls):
+        if self.rtyper.needs_hash_support(self.classdef):
             vinst, = hop.inputargs(self)
             return hop.gendirectcall(ll_inst_hash, vinst)
         else:

Modified: pypy/branch/somepbc-refactoring/pypy/rpython/rclass.py
==============================================================================
--- pypy/branch/somepbc-refactoring/pypy/rpython/rclass.py	(original)
+++ pypy/branch/somepbc-refactoring/pypy/rpython/rclass.py	Sat Nov 26 02:36:05 2005
@@ -53,17 +53,17 @@
 
     def __repr__(self):
         if self.classdef is None:
-            cls = object
+            clsname = 'object'
         else:
-            cls = self.classdef.cls
-        return '<ClassRepr for %s.%s>' % (cls.__module__, cls.__name__)
+            clsname = self.classdef.name
+        return '<ClassRepr for %s>' % (clsname,)
 
     def compact_repr(self):
         if self.classdef is None:
-            cls = object
+            clsname = 'object'
         else:
-            cls = self.classdef.cls
-        return 'ClassR %s.%s' % (cls.__module__, cls.__name__)
+            clsname = self.classdef.name
+        return 'ClassR %s' % (clsname,)
 
     def convert_desc(self, desc):
         subclassdef = desc.getuniqueclassdef()
@@ -117,17 +117,17 @@
 
     def __repr__(self):
         if self.classdef is None:
-            cls = object
+            clsname = 'object'
         else:
-            cls = self.classdef.cls
-        return '<InstanceRepr for %s.%s>' % (cls.__module__, cls.__name__)
+            clsname = self.classdef.name
+        return '<InstanceRepr for %s>' % (clsname,)
 
     def compact_repr(self):
         if self.classdef is None:
-            cls = object
+            clsname = 'object'
         else:
-            cls = self.classdef.cls
-        return 'InstanceR %s.%s' % (cls.__module__, cls.__name__)
+            clsname = self.classdef.name
+        return 'InstanceR %s' % (clsname,)
 
     def _setup_repr_final(self):
         pass