[pypy-commit] pypy py3k: kill more cpython-like unicodehelper function names

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r63182:089c32b3f248
Date: 2013-04-09 16:38 -0700
http://bitbucket.org/pypy/pypy/changeset/089c32b3f248/

Log:	kill more cpython-like unicodehelper function names

diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -1382,12 +1382,12 @@
         return w_obj.identifier_w(self)
 
     def fsencode(space, w_obj):
-        from pypy.interpreter.unicodehelper import PyUnicode_EncodeFSDefault
-        return PyUnicode_EncodeFSDefault(space, w_obj)
+        from pypy.interpreter.unicodehelper import fsencode
+        return fsencode(space, w_obj)
 
     def fsdecode(space, w_obj):
-        from pypy.interpreter.unicodehelper import PyUnicode_DecodeFSDefault
-        return PyUnicode_DecodeFSDefault(space, w_obj)
+        from pypy.interpreter.unicodehelper import fsdecode
+        return fsdecode(space, w_obj)
 
     def fsencode_w(self, w_obj):
         if self.isinstance_w(w_obj, self.w_unicode):
diff --git a/pypy/interpreter/unicodehelper.py b/pypy/interpreter/unicodehelper.py
--- a/pypy/interpreter/unicodehelper.py
+++ b/pypy/interpreter/unicodehelper.py
@@ -37,7 +37,7 @@
 
 # ____________________________________________________________
 
-def PyUnicode_DecodeFSDefault(space, w_string):
+def fsdecode(space, w_string):
     state = space.fromcache(interp_codecs.CodecState)
     if _WIN32:
         bytes = space.bytes_w(w_string)
@@ -64,7 +64,7 @@
                                  space.wrap('surrogateescape'))
     return space.wrap(uni)
 
-def PyUnicode_EncodeFSDefault(space, w_uni):
+def fsencode(space, w_uni):
     state = space.fromcache(interp_codecs.CodecState)
     if _WIN32:
         uni = space.unicode_w(w_uni)