Author: Matti Picus <matti.pi...@gmail.com>
Branch: py3.5
Changeset: r94242:4e6fcbd80661
Date: 2018-04-05 08:43 +0300
http://bitbucket.org/pypy/pypy/changeset/4e6fcbd80661/
Log: fix merge
diff --git a/pypy/interpreter/pyparser/pyparse.py
b/pypy/interpreter/pyparser/pyparse.py
--- a/pypy/interpreter/pyparser/pyparse.py
+++ b/pypy/interpreter/pyparser/pyparse.py
@@ -148,12 +148,12 @@
raise
if enc is not None:
compile_info.encoding = enc
+ if explicit_encoding:
+ compile_info.flags |= consts.PyCF_FOUND_ENCODING
return self._parse(textsrc, compile_info)
def _parse(self, textsrc, compile_info):
flags = compile_info.flags
- if explicit_encoding:
- flags |= consts.PyCF_FOUND_ENCODING
# The tokenizer is very picky about how it wants its input.
source_lines = textsrc.splitlines(True)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
