Author: Armin Rigo <ar...@tunes.org>
Branch: py3.5-newtext
Changeset: r90144:9c8c313486ee
Date: 2017-02-15 10:06 +0100
http://bitbucket.org/pypy/pypy/changeset/9c8c313486ee/
Log: fix merge
diff --git a/pypy/interpreter/test/test_argument.py
b/pypy/interpreter/test/test_argument.py
--- a/pypy/interpreter/test/test_argument.py
+++ b/pypy/interpreter/test/test_argument.py
@@ -102,9 +102,6 @@
def text_w(self, s):
return self.str_w(s)
- def text_w(self, s):
- return self.str_w(s)
-
def unicode_w(self, s):
return unicode(s)
diff --git a/pypy/objspace/std/objspace.py b/pypy/objspace/std/objspace.py
--- a/pypy/objspace/std/objspace.py
+++ b/pypy/objspace/std/objspace.py
@@ -92,8 +92,6 @@
self.builtin_types[typedef.name] = w_type
setattr(self, 'w_' + typedef.name, w_type)
self._interplevel_classes[w_type] = cls
- self.w_bytes = self.w_str
- self.w_text = self.w_str # this is w_unicode on Py3
self.w_dict.flag_map_or_seq = 'M'
self.w_list.flag_map_or_seq = 'S'
self.w_tuple.flag_map_or_seq = 'S'
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
