[pypy-svn] r33783 - pypy/dist/pypy/rpython/ootypesystem

[antocuni at codespeak.net]

Author: antocuni
Date: Thu Oct 26 21:39:15 2006
New Revision: 33783

Modified:
   pypy/dist/pypy/rpython/ootypesystem/ootype.py
Log:
Ooops... forgot to check in togheter with r33765.



Modified: pypy/dist/pypy/rpython/ootypesystem/ootype.py
==============================================================================
--- pypy/dist/pypy/rpython/ootypesystem/ootype.py	(original)
+++ pypy/dist/pypy/rpython/ootypesystem/ootype.py	Thu Oct 26 21:39:15 2006
@@ -923,7 +923,7 @@
         METH = self._resolve_overloading(ARGS)._TYPE
         return self._lltype_to_annotation(METH.RESULT)
 
-    def _annotation_to_lltype(self, ann):
+    def _annotation_to_lltype(cls, ann):
         from pypy.annotation import model as annmodel
         if isinstance(ann, annmodel.SomeChar):
             return Char
@@ -931,8 +931,9 @@
             return String
         else:
             return annmodel.annotation_to_lltype(ann)
+    _annotation_to_lltype = classmethod(_annotation_to_lltype)
 
-    def _lltype_to_annotation(self, TYPE):
+    def _lltype_to_annotation(cls, TYPE):
         from pypy.annotation import model as annmodel
         if TYPE is Char:
             return annmodel.SomeChar()
@@ -940,6 +941,7 @@
             return annmodel.SomeString()
         else:
             return annmodel.lltype_to_annotation(TYPE)
+    _lltype_to_annotation = classmethod(_lltype_to_annotation)
 
 
 class _overloaded_meth(_meth, _overloaded_mixin):