Author: Carl Friedrich Bolz <cfb...@gmx.de>
Branch: space-newtext
Changeset: r88041:5fef2e96ef36
Date: 2016-11-01 17:55 +0100
http://bitbucket.org/pypy/pypy/changeset/5fef2e96ef36/
Log: remove some str_w calls
diff --git a/pypy/interpreter/argument.py b/pypy/interpreter/argument.py
--- a/pypy/interpreter/argument.py
+++ b/pypy/interpreter/argument.py
@@ -359,7 +359,7 @@
i = 0
for w_key in keys_w:
try:
- key = space.str_w(w_key)
+ key = space.text_w(w_key)
except OperationError as e:
if e.match(space, space.w_TypeError):
raise oefmt(space.w_TypeError, "keywords must be strings")
@@ -538,7 +538,7 @@
w_err = space.newtext("replace")
w_name = space.call_method(w_name, "encode", w_enc,
w_err)
- name = space.str_w(w_name)
+ name = space.text_w(w_name)
break
self.kwd_name = name
diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -636,7 +636,7 @@
w_keys = self.call_method(w_dic, "keys")
exc_types_w = {}
for w_name in self.unpackiterable(w_keys):
- name = self.str_w(w_name)
+ name = self.text_w(w_name)
if not name.startswith('__'):
excname = name
w_exc = self.getitem(w_dic, w_name)
diff --git a/pypy/interpreter/pycode.py b/pypy/interpreter/pycode.py
--- a/pypy/interpreter/pycode.py
+++ b/pypy/interpreter/pycode.py
@@ -26,7 +26,7 @@
# helper
def unpack_str_tuple(space,w_str_tuple):
- return [space.str_w(w_el) for w_el in space.unpackiterable(w_str_tuple)]
+ return [space.text_w(w_el) for w_el in space.unpackiterable(w_str_tuple)]
# Magic numbers for the bytecode version in code objects.
diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -468,7 +468,7 @@
return self.getcode().co_consts_w[index]
def getname_u(self, index):
- return self.space.str_w(self.getcode().co_names_w[index])
+ return self.space.text_w(self.getcode().co_names_w[index])
def getname_w(self, index):
return self.getcode().co_names_w[index]
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
@@ -97,6 +97,8 @@
def str_w(self, s):
return str(s)
+ def text_w(self, s):
+ return self.str_w(s)
def len(self, x):
return len(x)
diff --git a/pypy/objspace/std/bytesobject.py b/pypy/objspace/std/bytesobject.py
--- a/pypy/objspace/std/bytesobject.py
+++ b/pypy/objspace/std/bytesobject.py
@@ -31,8 +31,8 @@
return True
if self.user_overridden_class or w_other.user_overridden_class:
return False
- s1 = space.str_w(self)
- s2 = space.str_w(w_other)
+ s1 = space.bytes_w(self)
+ s2 = space.bytes_w(w_other)
if len(s2) > 1:
return s1 is s2
else: # strings of len <= 1 are unique-ified
@@ -41,7 +41,7 @@
def immutable_unique_id(self, space):
if self.user_overridden_class:
return None
- s = space.str_w(self)
+ s = space.bytes_w(self)
if len(s) > 1:
uid = compute_unique_id(s)
else: # strings of len <= 1 are unique-ified
@@ -571,7 +571,7 @@
w_obj = space.str(w_object)
if space.is_w(w_stringtype, space.w_str):
return w_obj # XXX might be reworked when space.str() typechecks
- value = space.str_w(w_obj)
+ value = space.bytes_w(w_obj)
w_obj = space.allocate_instance(W_BytesObject, w_stringtype)
W_BytesObject.__init__(w_obj, value)
return w_obj
diff --git a/pypy/objspace/std/intobject.py b/pypy/objspace/std/intobject.py
--- a/pypy/objspace/std/intobject.py
+++ b/pypy/objspace/std/intobject.py
@@ -696,7 +696,7 @@
value = space.int_w(w_obj, allow_conversion=False)
elif space.isinstance_w(w_value, space.w_str):
value, w_longval = _string_to_int_or_long(space, w_value,
- space.str_w(w_value))
+ space.text_w(w_value))
elif space.isinstance_w(w_value, space.w_unicode):
from pypy.objspace.std.unicodeobject import unicode_to_decimal_w
string = unicode_to_decimal_w(space, w_value)
@@ -721,7 +721,7 @@
s = unicode_to_decimal_w(space, w_value)
else:
try:
- s = space.str_w(w_value)
+ s = space.text_w(w_value)
except OperationError as e:
raise oefmt(space.w_TypeError,
"int() can't convert non-string with explicit "
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
