[pypy-commit] pypy unicode-utf8-py3: remove more deprecated space.str_w

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: unicode-utf8-py3
Changeset: r94832:383fb0dd6744
Date: 2018-07-08 12:18 -0700
http://bitbucket.org/pypy/pypy/changeset/383fb0dd6744/

Log:	remove more deprecated space.str_w

diff --git a/pypy/interpreter/astcompiler/test/test_compiler.py b/pypy/interpreter/astcompiler/test/test_compiler.py
--- a/pypy/interpreter/astcompiler/test/test_compiler.py
+++ b/pypy/interpreter/astcompiler/test/test_compiler.py
@@ -76,7 +76,7 @@
         space = self.space
         pyco_expr = PyCode._from_code(space, co_expr)
         w_res = pyco_expr.exec_host_bytecode(w_dict, w_dict)
-        res = space.str_w(space.repr(w_res))
+        res = space.text_w(space.repr(w_res))
         expected_repr = self.get_py3_repr(expected)
         if isinstance(expected, float):
             # Float representation can vary a bit between interpreter
@@ -1425,7 +1425,7 @@
             ''', d)
             return d['f'](5)
         """)
-        assert 'generator' in space.str_w(space.repr(w_generator))
+        assert 'generator' in space.text_w(space.repr(w_generator))
 
     def test_folding_of_list_constants(self):
         for source in (
diff --git a/pypy/interpreter/pyparser/test/test_parsestring.py b/pypy/interpreter/pyparser/test/test_parsestring.py
--- a/pypy/interpreter/pyparser/test/test_parsestring.py
+++ b/pypy/interpreter/pyparser/test/test_parsestring.py
@@ -112,14 +112,14 @@
         space = self.space
         s = '"""' + '\\' + '\n"""'
         w_ret = parsestring.parsestr(space, None, s)
-        assert space.str_w(w_ret) == ''
+        assert space.text_w(w_ret) == ''
 
     def test_bug1(self):
         space = self.space
         expected = ['x', ' ', chr(0xc3), chr(0xa9), ' ', '\n']
         input = ["'", 'x', ' ', chr(0xc3), chr(0xa9), ' ', chr(92), 'n', "'"]
         w_ret = parsestring.parsestr(space, 'utf8', ''.join(input))
-        assert space.str_w(w_ret) == ''.join(expected)
+        assert space.text_w(w_ret) == ''.join(expected)
 
     def test_wide_unicode_in_source(self):
         if sys.maxunicode == 65535: