[pypy-commit] pypy unicode-utf8-py3: replace old code, remove pdb

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: unicode-utf8-py3
Changeset: r94789:fbe5d8ba3ad5
Date: 2018-06-30 19:45 -0700
http://bitbucket.org/pypy/pypy/changeset/fbe5d8ba3ad5/

Log:	replace old code, remove pdb

diff --git a/pypy/interpreter/pyparser/parsestring.py b/pypy/interpreter/pyparser/parsestring.py
--- a/pypy/interpreter/pyparser/parsestring.py
+++ b/pypy/interpreter/pyparser/parsestring.py
@@ -114,7 +114,7 @@
         elif saw_f:
             return W_FString(substr, rawmode)
         else:
-            v = unicodehelper.decode_utf8(space, substr)
+            v = unicodehelper.str_decode_utf8(substr, 'strict', True, None)
             return space.newtext(v)
 
     v = PyString_DecodeEscape(space, substr, 'strict', encoding)
diff --git a/pypy/objspace/std/unicodeobject.py b/pypy/objspace/std/unicodeobject.py
--- a/pypy/objspace/std/unicodeobject.py
+++ b/pypy/objspace/std/unicodeobject.py
@@ -192,8 +192,6 @@
         if w_object is None:
             w_value = W_UnicodeObject.EMPTY
         else:
-            if w_encoding and w_encoding._utf8 == 'unicode_internal':
-                import pdb;pdb.set_trace()
             encoding, errors = _get_encoding_and_errors(space, w_encoding,
                                                         w_errors)
             if encoding is None and errors is None: