diff Python/future.c @ 46120:78504d604b44

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. ........
author Christian Heimes <christian@cheimes.de>
date Wed, 26 Mar 2008 22:34:47 +0000
parents 91ac8049e709
children 85b67fb5672b
line wrap: on
line diff
--- a/Python/future.c	Wed Mar 26 19:49:26 2008 +0000
+++ b/Python/future.c	Wed Mar 26 22:34:47 2008 +0000
@@ -35,6 +35,8 @@
 			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");