[pypy-svn] r69288 - in pypy/trunk/pypy: annotation translator/c

[cfbolz at codespeak.net]

Author: cfbolz
Date: Sat Nov 14 15:54:56 2009
New Revision: 69288

Modified:
   pypy/trunk/pypy/annotation/description.py
   pypy/trunk/pypy/translator/c/node.py
Log:
fix deprecation warnings


Modified: pypy/trunk/pypy/annotation/description.py
==============================================================================
--- pypy/trunk/pypy/annotation/description.py	(original)
+++ pypy/trunk/pypy/annotation/description.py	Sat Nov 14 15:54:56 2009
@@ -552,7 +552,7 @@
         if self.is_exception_class():
             if self.pyobj.__module__ == 'exceptions':
                 return True
-            if self.pyobj is py.magic.AssertionError:
+            if self.pyobj is py.code._AssertionError:
                 return True
         return False
 

Modified: pypy/trunk/pypy/translator/c/node.py
==============================================================================
--- pypy/trunk/pypy/translator/c/node.py	(original)
+++ pypy/trunk/pypy/translator/c/node.py	Sat Nov 14 15:54:56 2009
@@ -925,7 +925,7 @@
         if isinstance(value, (type, types.ClassType)):
             if (issubclass(value, BaseException) and
                 (value.__module__ == 'exceptions'
-                 or value is py.magic.AssertionError)):
+                 or value is py.code._AssertionError)):
                 return 'PyExc_' + value.__name__
         raise Exception("don't know how to simply render py object: %r" %
                         (value, ))