Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r71783:808717088f2a
Date: 2014-05-29 12:43 -0700
http://bitbucket.org/pypy/pypy/changeset/808717088f2a/
Log: hopefully fix translation
diff --git a/pypy/objspace/descroperation.py b/pypy/objspace/descroperation.py
--- a/pypy/objspace/descroperation.py
+++ b/pypy/objspace/descroperation.py
@@ -437,12 +437,14 @@
raise oefmt(space.w_TypeError,
"__hash__ method should return an integer")
- from pypy.objspace.std.intobject import W_IntObject
+ from pypy.objspace.std.intobject import (
+ W_AbstractIntObject, W_IntObject)
if type(w_result) is W_IntObject:
return w_result
elif isinstance(w_result, W_IntObject):
return space.wrap(space.int_w(w_result))
# a non W_IntObject int, assume long-like
+ assert isinstance(w_result, W_AbstractIntObject)
return w_result.descr_hash(space)
def userdel(space, w_obj):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
