Author: Ronan Lamy <[email protected]>
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
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
