[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pypy-svn
Subject:    [pypy-commit] pypy default: Use UnionError in one more place
From:       rlamy <noreply () buildbot ! pypy ! org>
Date:       2013-08-31 12:35:20
Message-ID: 20130831123520.AB7D61C0205 () cobra ! cs ! uni-duesseldorf ! de
[Download RAW message or body]

Author: Ronan Lamy <ronan.lamy@gmail.com>
Branch: 
Changeset: r66712:52103b670ed9
Date: 2013-08-31 13:33 +0100
http://bitbucket.org/pypy/pypy/changeset/52103b670ed9/

Log:	Use UnionError in one more place

diff --git a/rpython/annotator/binaryop.py b/rpython/annotator/binaryop.py
--- a/rpython/annotator/binaryop.py
+++ b/rpython/annotator/binaryop.py
@@ -825,14 +825,14 @@
                 if pbc.isNone():
                     return %(classname)s(%(constructor_args)s)
                 else:
-                    return SomeObject()
+                    raise UnionError(pbc, obj)
 
         class __extend__(pairtype(SomePBC, %(classname)s)):
             def union((pbc, obj)):
                 if pbc.isNone():
                     return %(classname)s(%(constructor_args)s)
                 else:
-                    return SomeObject()
+                    raise UnionError(pbc, obj)
     """ % loc)
     exec source.compile() in glob
 
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
[prev in list] [next in list] [prev in thread] [next in thread]