[pypy-commit] pypy py3.5-newtext: fix

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5-newtext
Changeset: r90127:9ea292d316da
Date: 2017-02-14 18:51 +0100
http://bitbucket.org/pypy/pypy/changeset/9ea292d316da/

Log:	fix

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
@@ -151,12 +151,12 @@
 def _get_escapechar(space, dialect):
     if dialect.escapechar == u'\0':
         return space.w_None
-    return space.newtext(dialect.escapechar)
+    return space.newunicode(dialect.escapechar)
 
 def _get_quotechar(space, dialect):
     if dialect.quotechar == u'\0':
         return space.w_None
-    return space.newtext(dialect.quotechar)
+    return space.newunicode(dialect.quotechar)
 
 
 W_Dialect.typedef = TypeDef(
@@ -164,12 +164,12 @@
         __new__ = interp2app(W_Dialect___new__),
 
         delimiter        = interp_attrproperty('delimiter', W_Dialect,
-            wrapfn='newtext'),
+            wrapfn='newunicode'),
         doublequote      = interp_attrproperty('doublequote', W_Dialect,
             wrapfn='newbool'),
         escapechar       = GetSetProperty(_get_escapechar, cls=W_Dialect),
         lineterminator   = interp_attrproperty('lineterminator', W_Dialect,
-            wrapfn='newtext'),
+            wrapfn='newunicode'),
         quotechar        = GetSetProperty(_get_quotechar, cls=W_Dialect),
         quoting          = interp_attrproperty('quoting', W_Dialect,
             wrapfn='newint'),
diff --git a/pypy/module/_csv/interp_reader.py b/pypy/module/_csv/interp_reader.py
--- a/pypy/module/_csv/interp_reader.py
+++ b/pypy/module/_csv/interp_reader.py
@@ -44,9 +44,9 @@
         field = field_builder.build()
         if self.numeric_field:
             self.numeric_field = False
-            w_obj = space.call_function(space.w_float, space.newtext(field))
+            w_obj = space.call_function(space.w_float, space.newunicode(field))
         else:
-            w_obj = space.newtext(field)
+            w_obj = space.newunicode(field)
         self.fields_w.append(w_obj)
 
     def next_w(self):
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
@@ -115,7 +115,7 @@
         rec.append(dialect.lineterminator)
 
         line = rec.build()
-        return space.call_function(self.w_filewrite, space.newtext(line))
+        return space.call_function(self.w_filewrite, space.newunicode(line))
 
     def writerows(self, w_seqseq):
         """Construct and write a series of sequences to a csv file.