[pypy-svn] pypy default: hg backout bdd4c428b285

amauryfa commits-noreply at bitbucket.org
Tue Jan 18 22:12:46 CET 2011

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Changeset: r40904:06cb83f863a8
Date: 2011-01-18 22:11 +0100

Log:	hg backout bdd4c428b285 It breaks translation

diff --git a/pypy/annotation/model.py b/pypy/annotation/model.py
--- a/pypy/annotation/model.py
+++ b/pypy/annotation/model.py
@@ -40,9 +40,6 @@
 DEBUG = False    # set to False to disable recording of debugging information
 TLS = tlsobject()
-class NoPreciseAnnotation(Exception):
-    pass
 class SomeObject(object):
     """The set of all objects.  Each instance stands
     for an arbitrary object about which nothing is known."""
@@ -745,7 +742,9 @@
         for arg in flattened:
             if arg.__class__ is SomeObject and arg.knowntype is not type:
                 return  SomeObject()
-        raise NoPreciseAnnotation()
+        bookkeeper = pypy.annotation.bookkeeper.getbookkeeper()
+        bookkeeper.warning("no precise annotation supplied for %s%r" % (name, args))
+        return s_ImpossibleValue
     setattr(cls, name, default_op)
 class HarmlesslyBlocked(Exception):

More information about the Pypy-commit mailing list