Author: Amaury Forgeot d'Arc <[email protected]>
Branch: py3k
Changeset: r47997:1b2a92468026
Date: 2011-10-12 22:19 +0200
http://bitbucket.org/pypy/pypy/changeset/1b2a92468026/
Log: Enable unicode literals by default
diff --git a/pypy/interpreter/astcompiler/astbuilder.py
b/pypy/interpreter/astcompiler/astbuilder.py
--- a/pypy/interpreter/astcompiler/astbuilder.py
+++ b/pypy/interpreter/astcompiler/astbuilder.py
@@ -1065,10 +1065,8 @@
space = self.space
encoding = self.compile_info.encoding
flags = self.compile_info.flags
- unicode_literals = flags & consts.CO_FUTURE_UNICODE_LITERALS
try:
- sub_strings_w = [parsestring.parsestr(space, encoding, s.value,
- unicode_literals)
+ sub_strings_w = [parsestring.parsestr(space, encoding, s.value)
for s in atom_node.children]
except error.OperationError, e:
if not e.match(space, space.w_UnicodeError):
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
@@ -1,7 +1,7 @@
from pypy.interpreter.error import OperationError
from pypy.interpreter import unicodehelper
-def parsestr(space, encoding, s, unicode_literals=False):
+def parsestr(space, encoding, s):
# compiler.transformer.Transformer.decode_literal depends on what
# might seem like minor details of this function -- changes here
# must be reflected there.
@@ -11,7 +11,7 @@
ps = 0
quote = s[ps]
rawmode = False
- unicode = unicode_literals
+ unicode = True
# string decoration handling
o = ord(quote)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
