Author: Matti Picus <[email protected]>
Branch: py3.6
Changeset: r97207:2e89e7ae99c0
Date: 2019-08-18 10:27 +0300
http://bitbucket.org/pypy/pypy/changeset/2e89e7ae99c0/
Log: test, fix error message for CPython3 compatibility
diff --git a/pypy/interpreter/test/test_typedef.py
b/pypy/interpreter/test/test_typedef.py
--- a/pypy/interpreter/test/test_typedef.py
+++ b/pypy/interpreter/test/test_typedef.py
@@ -182,7 +182,7 @@
self.space.appexec([w_obj], """(obj):
assert type(obj).__hash__ is None
err = raises(TypeError, hash, obj)
- assert str(err.value) == "'some_type' objects are unhashable"
+ assert str(err.value) == "unhashable type: 'some_type'"
""")
def test_destructor(self):
diff --git a/pypy/objspace/descroperation.py b/pypy/objspace/descroperation.py
--- a/pypy/objspace/descroperation.py
+++ b/pypy/objspace/descroperation.py
@@ -438,7 +438,7 @@
return default_identity_hash(space, w_obj)
if space.is_w(w_hash, space.w_None):
raise oefmt(space.w_TypeError,
- "'%T' objects are unhashable", w_obj)
+ "unhashable type: '%T'", w_obj)
w_result = space.get_and_call_function(w_hash, w_obj)
if not space.isinstance_w(w_result, space.w_int):
raise oefmt(space.w_TypeError,
diff --git a/testrunner/get_info.py b/testrunner/get_info.py
--- a/testrunner/get_info.py
+++ b/testrunner/get_info.py
@@ -13,7 +13,6 @@
# PyPy uses bin as of PR https://github.com/pypa/virtualenv/pull/1400
TARGET_DIR = 'bin'
else:
- TARGET_NAME = 'pypy-c'
TARGET_NAME = 'pypy3-c'
TARGET_DIR = 'bin'
VENV_DIR = 'pypy-venv'
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
