Author: Matti Picus <matti.pi...@gmail.com> Branch: py3.6 Changeset: r96010:c3059a6a2591 Date: 2019-02-14 00:51 +0200 http://bitbucket.org/pypy/pypy/changeset/c3059a6a2591/
Log: fix merge diff --git a/pypy/module/_codecs/interp_codecs.py b/pypy/module/_codecs/interp_codecs.py --- a/pypy/module/_codecs/interp_codecs.py +++ b/pypy/module/_codecs/interp_codecs.py @@ -8,9 +8,6 @@ from pypy.interpreter.error import OperationError, oefmt from pypy.interpreter.gateway import interp2app, unwrap_spec, WrappedDefault from pypy.interpreter import unicodehelper -from pypy.interpreter.unicodehelper import ( - unicode_encode_utf_8_impl, - str_decode_unicode_escape) from pypy.module.unicodedata import unicodedb _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit
