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 | 738a1fcdbf99d66cbb07f19fce673b1c0fb941db (patch) | |
| tree | f38c598cd374062c11abd898f652f851e01641a3 /Python/future.c | |
| parent | 052829054fa874b5a40ae694aa1e94ac8a6dae04 (diff) | |
| download | cpython-738a1fcdbf99d66cbb07f19fce673b1c0fb941db.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 'Python/future.c')
| -rw-r--r-- | Python/future.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Python/future.c b/Python/future.c index d6333ff63e..a5bee0c9c6 100644 --- a/Python/future.c +++ b/Python/future.c @@ -35,6 +35,8 @@ future_check_features(PyFutureFeatures *ff, stmt_ty s, const char *filename) continue; } else if (strcmp(feature, FUTURE_PRINT_FUNCTION) == 0) { continue; + } else if (strcmp(feature, FUTURE_UNICODE_LITERALS) == 0) { + continue; } else if (strcmp(feature, "braces") == 0) { PyErr_SetString(PyExc_SyntaxError, "not a chance"); |