diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-03-26 22:34:47 +0000 |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-03-26 22:34:47 +0000 |
| commit | 4d6ec85a022d05f11966004edc36151ab26bb13a (patch) | |
| tree | acab0f1f76a8789a060d1a9c7a723152d69fde8a /Lib/__future__.py | |
| parent | 9edef04c956c36aaa3ccc3eaef2d99f233153297 (diff) | |
| download | cpython-git-4d6ec85a022d05f11966004edc36151ab26bb13a.tar.gz | |
Merged revisions 61952-61953 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r61952 | mark.dickinson | 2008-03-26 22:41:36 +0100 (Wed, 26 Mar 2008) | 2 lines
Typo: "objects reference count" -> "object's reference count"
........
r61953 | christian.heimes | 2008-03-26 23:01:37 +0100 (Wed, 26 Mar 2008) | 4 lines
Patch #2477: Added from __future__ import unicode_literals
The new PyParser_*Ex() functions are based on Neal's suggestion and initial patch. The new __future__ feature makes all '' and r'' unicode strings. b'' and br'' stay (byte) strings.
........
Diffstat (limited to 'Lib/__future__.py')
| -rw-r--r-- | Lib/__future__.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Lib/__future__.py b/Lib/__future__.py index ea14bf39ab..915645933c 100644 --- a/Lib/__future__.py +++ b/Lib/__future__.py @@ -54,6 +54,7 @@ all_feature_names = [ "absolute_import", "with_statement", "print_function", + "unicode_literals", ] __all__ = ["all_feature_names"] + all_feature_names @@ -68,6 +69,7 @@ CO_FUTURE_DIVISION = 0x2000 # division CO_FUTURE_ABSOLUTE_IMPORT = 0x4000 # perform absolute imports by default CO_FUTURE_WITH_STATEMENT = 0x8000 # with statement CO_FUTURE_PRINT_FUNCTION = 0x10000 # print function +CO_FUTURE_UNICODE_LITERALS = 0x20000 # unicode string literals class _Feature: def __init__(self, optionalRelease, mandatoryRelease, compiler_flag): @@ -120,3 +122,7 @@ with_statement = _Feature((2, 5, 0, "alpha", 1), print_function = _Feature((2, 6, 0, "alpha", 2), (3, 0, 0, "alpha", 0), CO_FUTURE_PRINT_FUNCTION) + +unicode_literals = _Feature((2, 6, 0, "alpha", 2), + (3, 0, 0, "alpha", 0), + CO_FUTURE_UNICODE_LITERALS) |