Author: Matti Picus <matti.pi...@gmail.com> Branch: unicode-utf8-py3 Changeset: r94824:00be052b857f Date: 2018-07-02 15:38 -0500 http://bitbucket.org/pypy/pypy/changeset/00be052b857f/
Log: more places where the rpython type needs to be true unicode diff --git a/pypy/interpreter/error.py b/pypy/interpreter/error.py --- a/pypy/interpreter/error.py +++ b/pypy/interpreter/error.py @@ -507,9 +507,9 @@ if fmt == 'd': result = str(value).decode('ascii') elif fmt == 'R': - result = space.utf8_w(space.repr(value)) + result = space.realunicode_w(space.repr(value)) elif fmt == 'S': - result = space.utf8_w(space.str(value)) + result = space.realunicode_w(space.str(value)) elif fmt == 'T': result = _decode_utf8(space.type(value).name) elif fmt == 'N': diff --git a/pypy/interpreter/gateway.py b/pypy/interpreter/gateway.py --- a/pypy/interpreter/gateway.py +++ b/pypy/interpreter/gateway.py @@ -327,7 +327,7 @@ self.run_args.append("space.text0_w(%s)" % (self.scopenext(),)) def visit_unicode(self, typ): - self.run_args.append("space.utf_8(%s)" % (self.scopenext(),)) + self.run_args.append("space.realunicode_w(%s)" % (self.scopenext(),)) def visit_utf8(self, typ): self.run_args.append("space.utf8_w(%s)" % (self.scopenext(),)) @@ -498,7 +498,7 @@ self.unwrap.append("space.text_w(%s)" % (self.nextarg(),)) def visit_unicode(self, typ): - self.unwrap.append("space.utf_8(%s)" % (self.nextarg(),)) + self.unwrap.append("space.realunicode_w(%s)" % (self.nextarg(),)) def visit_text0(self, typ): self.unwrap.append("space.text0_w(%s)" % (self.nextarg(),)) diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py --- a/pypy/interpreter/pyopcode.py +++ b/pypy/interpreter/pyopcode.py @@ -1649,7 +1649,7 @@ lst = [] for i in range(itemcount-1, -1, -1): w_item = self.peekvalue(i) - lst.append(space.utf8_w(w_item)) + lst.append(space.realunicode_w(w_item)) self.dropvalues(itemcount) w_res = space.newtext(u''.join(lst)) self.pushvalue(w_res) diff --git a/pypy/module/_csv/interp_csv.py b/pypy/module/_csv/interp_csv.py --- a/pypy/module/_csv/interp_csv.py +++ b/pypy/module/_csv/interp_csv.py @@ -43,7 +43,7 @@ if w_src is None: return default try: - return space.utf8_w(w_src) + return space.realunicode_w(w_src) except OperationError as e: if e.match(space, space.w_TypeError): raise oefmt(space.w_TypeError, '"%s" must be a string', attrname) @@ -56,7 +56,7 @@ return u'\0' if not space.isinstance_w(w_src, space.w_unicode): raise oefmt(space.w_TypeError, '"%s" must be string, not %T', name, w_src) - src = space.utf8_w(w_src) + src = space.realunicode_w(w_src) if len(src) == 1: return src[0] if len(src) == 0: diff --git a/pypy/module/_csv/interp_writer.py b/pypy/module/_csv/interp_writer.py --- a/pypy/module/_csv/interp_writer.py +++ b/pypy/module/_csv/interp_writer.py @@ -42,9 +42,9 @@ if space.is_w(w_field, space.w_None): field = u"" elif space.isinstance_w(w_field, space.w_float): - field = space.utf8_w(space.repr(w_field)) + field = space.realunicode_w(space.repr(w_field)) else: - field = space.utf8_w(space.str(w_field)) + field = space.realunicode_w(space.str(w_field)) # if dialect.quoting == QUOTE_NONNUMERIC: try: _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit