Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r87682:88ebbb0a0058
Date: 2016-10-09 19:29 -0700
http://bitbucket.org/pypy/pypy/changeset/88ebbb0a0058/
Log: adapt to py3
diff --git a/pypy/objspace/std/test/test_typeobject.py
b/pypy/objspace/std/test/test_typeobject.py
--- a/pypy/objspace/std/test/test_typeobject.py
+++ b/pypy/objspace/std/test/test_typeobject.py
@@ -897,7 +897,7 @@
Abc.__name__ = 'Def'
assert Abc.__name__ == 'Def'
raises(TypeError, "Abc.__name__ = 42")
- raises(TypeError, "Abc.__name__ = u'A'")
+ raises(TypeError, "Abc.__name__ = b'A'")
try:
Abc.__name__ = 'G\x00hi'
except ValueError as e:
@@ -1221,12 +1221,12 @@
assert int.__subclasscheck__(AbstractClass()) is True
def test_bad_args(self):
- import UserDict
+ import collections
raises(TypeError, type, 'A', (), dict={})
raises(TypeError, type, 'A', [], {})
- raises(TypeError, type, 'A', (), UserDict.UserDict())
+ raises(TypeError, type, 'A', (), collections.UserDict())
raises(ValueError, type, 'A\x00B', (), {})
- raises(TypeError, type, u'A', (), {})
+ raises(TypeError, type, b'A', (), {})
class AppTestWithMethodCacheCounter:
diff --git a/pypy/objspace/std/typeobject.py b/pypy/objspace/std/typeobject.py
--- a/pypy/objspace/std/typeobject.py
+++ b/pypy/objspace/std/typeobject.py
@@ -684,7 +684,7 @@
def _check_new_args(space, w_name, w_bases, w_dict):
if w_bases is None or w_dict is None:
raise oefmt(space.w_TypeError, "type() takes 1 or 3 arguments")
- if not space.isinstance_w(w_name, space.w_str):
+ if not space.isinstance_w(w_name, space.w_text):
raise oefmt(space.w_TypeError,
"type() argument 1 must be string, not %T", w_name)
if not space.isinstance_w(w_bases, space.w_tuple):
@@ -769,7 +769,7 @@
w_type = _check(space, w_type)
if not w_type.is_heaptype():
raise oefmt(space.w_TypeError, "can't set %N.__name__", w_type)
- if not space.isinstance_w(w_value, space.w_str):
+ if not space.isinstance_w(w_value, space.w_text):
raise oefmt(space.w_TypeError,
"can only assign string to %N.__name__, not '%T'",
w_type, w_value)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
