aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfijal <unknown>2017-02-21 13:04:09 +0100
committerfijal <unknown>2017-02-21 13:04:09 +0100
commit191cfc0e6cbf47e1d79fb1df0ace054a27057896 (patch)
treec3d849cc61aedf39130da99721e6defb5a324739 /pypy/objspace/std/bytesobject.py
parentStart fighting on a new branch with utf8 being the default storage (diff)
downloadpypy-191cfc0e6cbf47e1d79fb1df0ace054a27057896.tar.gz
pypy-191cfc0e6cbf47e1d79fb1df0ace054a27057896.tar.bz2
pypy-191cfc0e6cbf47e1d79fb1df0ace054a27057896.zip
fix the nomenclature and put a few stop gaps in places we know need fixing
Diffstat (limited to 'pypy/objspace/std/bytesobject.py')
-rw-r--r--pypy/objspace/std/bytesobject.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pypy/objspace/std/bytesobject.py b/pypy/objspace/std/bytesobject.py
index d7e3878186..6926a91dcc 100644
--- a/pypy/objspace/std/bytesobject.py
+++ b/pypy/objspace/std/bytesobject.py
@@ -16,7 +16,7 @@ from pypy.objspace.std.basestringtype import basestring_typedef
from pypy.objspace.std.formatting import mod_format
from pypy.objspace.std.stringmethods import StringMethods
from pypy.objspace.std.unicodeobject import (
- decode_object, unicode_from_encoded_object,
+ decode_object, utf8_from_encoded_object,
getdefaultencoding)
from pypy.objspace.std.util import IDTAG_SPECIAL, IDTAG_SHIFT