[pypy-commit] pypy py3k: Fixes after merge.

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3k
Changeset: r57537:609300b6c30f
Date: 2012-09-24 23:55 +0200
http://bitbucket.org/pypy/pypy/changeset/609300b6c30f/

Log:	Fixes after merge.

diff --git a/pypy/objspace/std/ropeunicodeobject.py b/pypy/objspace/std/ropeunicodeobject.py
--- a/pypy/objspace/std/ropeunicodeobject.py
+++ b/pypy/objspace/std/ropeunicodeobject.py
@@ -4,12 +4,11 @@
 from pypy.interpreter.error import OperationError, operationerrfmt
 from pypy.interpreter import gateway
 from pypy.objspace.std.stringobject import W_StringObject
-from pypy.objspace.std.unicodeobject import _normalize_index
+from pypy.objspace.std.unicodeobject import _normalize_index, _repr_function
 from pypy.objspace.std.ropeobject import W_RopeObject
 from pypy.objspace.std.noneobject import W_NoneObject
 from pypy.rlib import rope
 from pypy.rlib.rstring import StringBuilder
-from pypy.rlib.runicode import unicode_escape_nonprintable
 from pypy.objspace.std.sliceobject import W_SliceObject, normalize_simple_slice
 from pypy.objspace.std import unicodeobject, slicetype, iterobject
 from pypy.objspace.std.tupleobject import W_TupleObject
@@ -813,7 +812,7 @@
     node = w_unicode._node
     chars = node.flatten_unicode()
     size = node.length()
-    s = unicode_escape_nonprintable(chars, size, "strict", quotes=True)
+    s = _repr_function(chars, size, "strict")
     return space.wrap(s)
 
 def mod__RopeUnicode_ANY(space, w_format, w_values):
diff --git a/pypy/rlib/runicode.py b/pypy/rlib/runicode.py
--- a/pypy/rlib/runicode.py
+++ b/pypy/rlib/runicode.py
@@ -1337,8 +1337,6 @@
 # This function is also used by _codecs/interp_codecs.py
 (unicode_encode_unicode_escape, raw_unicode_escape_helper
  ) = make_unicode_escape_function()
-(unicode_escape_nonprintable, _
- ) = make_unicode_escape_function(for_repr=True)
 
 # ____________________________________________________________
 # Raw unicode escape