Author: Maciej Fijalkowski <[email protected]>
Branch: kill-someobject
Changeset: r58037:f761c7259467
Date: 2012-10-12 15:32 +0200
http://bitbucket.org/pypy/pypy/changeset/f761c7259467/
Log: fixes
diff --git a/pypy/annotation/binaryop.py b/pypy/annotation/binaryop.py
--- a/pypy/annotation/binaryop.py
+++ b/pypy/annotation/binaryop.py
@@ -550,9 +550,9 @@
def union((tup1, tup2)):
if len(tup1.items) != len(tup2.items):
- raise Exception("cannot take the union of a tuple of length %d "
- "and a tuple of length %d" % (len(tup1.items),
- len(tup2.items)))
+ raise UnionError("cannot take the union of a tuple of length %d "
+ "and a tuple of length %d" % (len(tup1.items),
+ len(tup2.items)))
else:
unions = [unionof(x,y) for x,y in zip(tup1.items, tup2.items)]
return SomeTuple(items = unions)
diff --git a/pypy/rlib/test/test_rmarshal.py b/pypy/rlib/test/test_rmarshal.py
--- a/pypy/rlib/test/test_rmarshal.py
+++ b/pypy/rlib/test/test_rmarshal.py
@@ -169,7 +169,7 @@
assert st2.st_mode == st.st_mode
assert st2[9] == st[9]
return buf
- fn = compile(f, [annmodel.s_Str0])
+ fn = compile(f, [str])
res = fn('.')
st = os.stat('.')
sttuple = marshal.loads(res)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
