[Python-3000-checkins] r61955 - in python/branches/py3k: Doc/c-api/structures.rst Include/code.h Include/compile.h Include/parsetok.h Lib/__future__.py Parser/parser.c Parser/parsetok.c Python/ast.c Python/future.c Python/import.c Python/pythonrun.c
christian.heimes
python-3000-checkins at python.org
Wed Mar 26 23:34:48 CET 2008
Author: christian.heimes
Date: Wed Mar 26 23:34:47 2008
New Revision: 61955
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Doc/c-api/structures.rst
python/branches/py3k/Include/code.h
python/branches/py3k/Include/compile.h
python/branches/py3k/Include/parsetok.h
python/branches/py3k/Lib/__future__.py
python/branches/py3k/Parser/parser.c
python/branches/py3k/Parser/parsetok.c
python/branches/py3k/Python/ast.c
python/branches/py3k/Python/future.c
python/branches/py3k/Python/import.c
python/branches/py3k/Python/pythonrun.c
Log:
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.
........
Modified: python/branches/py3k/Doc/c-api/structures.rst
==============================================================================
--- python/branches/py3k/Doc/c-api/structures.rst (original)
+++ python/branches/py3k/Doc/c-api/structures.rst Wed Mar 26 23:34:47 2008
@@ -20,7 +20,7 @@
All object types are extensions of this type. This is a type which contains the
information Python needs to treat a pointer to an object as an object. In a
- normal "release" build, it contains only the objects reference count and a
+ normal "release" build, it contains only the object's reference count and a
pointer to the corresponding type object. It corresponds to the fields defined
by the expansion of the ``PyObject_HEAD`` macro.
Modified: python/branches/py3k/Include/code.h
==============================================================================
--- python/branches/py3k/Include/code.h (original)
+++ python/branches/py3k/Include/code.h Wed Mar 26 23:34:47 2008
@@ -49,6 +49,7 @@
#define CO_FUTURE_ABSOLUTE_IMPORT 0x4000 /* do absolute imports by default */
#define CO_FUTURE_WITH_STATEMENT 0x8000
#define CO_FUTURE_PRINT_FUNCTION 0x10000
+#define CO_FUTURE_UNICODE_LITERALS 0x20000
#endif
/* This should be defined if a future statement modifies the syntax.
Modified: python/branches/py3k/Include/compile.h
==============================================================================
--- python/branches/py3k/Include/compile.h (original)
+++ python/branches/py3k/Include/compile.h Wed Mar 26 23:34:47 2008
@@ -25,6 +25,7 @@
#define FUTURE_ABSOLUTE_IMPORT "absolute_import"
#define FUTURE_WITH_STATEMENT "with_statement"
#define FUTURE_PRINT_FUNCTION "print_function"
+#define FUTURE_UNICODE_LITERALS "unicode_literals"
struct _mod; /* Declare the existence of this type */
PyAPI_FUNC(PyCodeObject *) PyAST_Compile(struct _mod *, const char *,
Modified: python/branches/py3k/Include/parsetok.h
==============================================================================
--- python/branches/py3k/Include/parsetok.h (original)
+++ python/branches/py3k/Include/parsetok.h Wed Mar 26 23:34:47 2008
@@ -25,6 +25,8 @@
#if 0
#define PyPARSE_WITH_IS_KEYWORD 0x0003
+#define PyPARSE_PRINT_IS_FUNCTION 0x0004
+#define PyPARSE_UNICODE_LITERALS 0x0008
#endif
PyAPI_FUNC(node *) PyParser_ParseString(const char *, grammar *, int,
@@ -38,11 +40,19 @@
const char*, grammar *,
int, char *, char *,
perrdetail *, int);
+PyAPI_FUNC(node *) PyParser_ParseFileFlagsEx(FILE *, const char *,
+ const char*, grammar *,
+ int, char *, char *,
+ perrdetail *, int *);
PyAPI_FUNC(node *) PyParser_ParseStringFlagsFilename(const char *,
const char *,
grammar *, int,
perrdetail *, int);
+PyAPI_FUNC(node *) PyParser_ParseStringFlagsFilenameEx(const char *,
+ const char *,
+ grammar *, int,
+ perrdetail *, int *);
/* Note that he following function is defined in pythonrun.c not parsetok.c. */
PyAPI_FUNC(void) PyParser_SetError(perrdetail *);
Modified: python/branches/py3k/Lib/__future__.py
==============================================================================
--- python/branches/py3k/Lib/__future__.py (original)
+++ python/branches/py3k/Lib/__future__.py Wed Mar 26 23:34:47 2008
@@ -54,6 +54,7 @@
"absolute_import",
"with_statement",
"print_function",
+ "unicode_literals",
]
__all__ = ["all_feature_names"] + all_feature_names
@@ -68,6 +69,7 @@
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 @@
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)
Modified: python/branches/py3k/Parser/parser.c
==============================================================================
--- python/branches/py3k/Parser/parser.c (original)
+++ python/branches/py3k/Parser/parser.c Wed Mar 26 23:34:47 2008
@@ -206,10 +206,18 @@
for (i = 0; i < NCH(ch); i += 2) {
cch = CHILD(ch, i);
- if (NCH(cch) >= 1 && TYPE(CHILD(cch, 0)) == NAME &&
- strcmp(STR(CHILD(cch, 0)), "with_statement") == 0) {
- ps->p_flags |= CO_FUTURE_WITH_STATEMENT;
- break;
+ if (NCH(cch) >= 1 && TYPE(CHILD(cch, 0)) == NAME) {
+ char *str_ch = STR(CHILD(cch, 0));
+ if (strcmp(str_ch, FUTURE_WITH_STATEMENT) == 0) {
+ ps->p_flags |= CO_FUTURE_WITH_STATEMENT;
+ break;
+ } else if (strcmp(str_ch, FUTURE_PRINT_FUNCTION) == 0) {
+ ps->p_flags |= CO_FUTURE_PRINT_FUNCTION;
+ break;
+ } else if (strcmp(str_ch, FUTURE_UNICODE_LITERALS) == 0) {
+ ps->p_flags |= CO_FUTURE_UNICODE_LITERALS;
+ break;
+ }
}
}
}
Modified: python/branches/py3k/Parser/parsetok.c
==============================================================================
--- python/branches/py3k/Parser/parsetok.c (original)
+++ python/branches/py3k/Parser/parsetok.c Wed Mar 26 23:34:47 2008
@@ -14,7 +14,7 @@
/* Forward */
-static node *parsetok(struct tok_state *, grammar *, int, perrdetail *, int);
+static node *parsetok(struct tok_state *, grammar *, int, perrdetail *, int *);
static void initerr(perrdetail *err_ret, const char* filename);
/* Parse input coming from a string. Return error code, print some errors. */
@@ -37,6 +37,16 @@
grammar *g, int start,
perrdetail *err_ret, int flags)
{
+ int iflags = flags;
+ return PyParser_ParseStringFlagsFilenameEx(s, filename, g, start,
+ err_ret, &iflags);
+}
+
+node *
+PyParser_ParseStringFlagsFilenameEx(const char *s, const char *filename,
+ grammar *g, int start,
+ perrdetail *err_ret, int *flags)
+{
struct tok_state *tok;
initerr(err_ret, filename);
@@ -64,10 +74,20 @@
}
node *
-PyParser_ParseFileFlags(FILE *fp, const char *filename, const char* enc,
+PyParser_ParseFileFlags(FILE *fp, const char *filename, const char *enc,
grammar *g, int start,
char *ps1, char *ps2, perrdetail *err_ret, int flags)
{
+ int iflags = flags;
+ return PyParser_ParseFileFlagsEx(fp, filename, enc, g, start, ps1,
+ ps2, err_ret, &iflags);
+}
+
+node *
+PyParser_ParseFileFlagsEx(FILE *fp, const char *filename,
+ const char *enc, grammar *g, int start,
+ char *ps1, char *ps2, perrdetail *err_ret, int *flags)
+{
struct tok_state *tok;
initerr(err_ret, filename);
@@ -104,7 +124,7 @@
static node *
parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret,
- int flags)
+ int *flags)
{
parser_state *ps;
node *n;
@@ -117,7 +137,7 @@
return NULL;
}
#ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD
- if (flags & PyPARSE_WITH_IS_KEYWORD)
+ if (*flags & PyPARSE_WITH_IS_KEYWORD)
ps->p_flags |= CO_FUTURE_WITH_STATEMENT;
#endif
@@ -141,7 +161,7 @@
except if a certain flag is given --
codeop.py uses this. */
if (tok->indent &&
- !(flags & PyPARSE_DONT_IMPLY_DEDENT))
+ !(*flags & PyPARSE_DONT_IMPLY_DEDENT))
{
tok->pendin = -tok->indent;
tok->indent = 0;
@@ -205,7 +225,9 @@
}
else
n = NULL;
-
+#ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD
+ *flags = ps->p_flags;
+#endif
PyParser_Delete(ps);
if (n == NULL) {
Modified: python/branches/py3k/Python/ast.c
==============================================================================
--- python/branches/py3k/Python/ast.c (original)
+++ python/branches/py3k/Python/ast.c Wed Mar 26 23:34:47 2008
@@ -35,7 +35,7 @@
static expr_ty ast_for_call(struct compiling *, const node *, expr_ty);
static PyObject *parsenumber(const char *);
-static PyObject *parsestr(const node *n, const char *encoding, int *bytesmode);
+static PyObject *parsestr(struct compiling *, const node *n, int *bytesmode);
static PyObject *parsestrplus(struct compiling *, const node *n,
int *bytesmode);
@@ -3191,14 +3191,13 @@
* parsestr parses it, and returns the decoded Python string object.
*/
static PyObject *
-parsestr(const node *n, const char *encoding, int *bytesmode)
+parsestr(struct compiling *c, const node *n, int *bytesmode)
{
size_t len;
const char *s = STR(n);
int quote = Py_CHARMASK(*s);
int rawmode = 0;
int need_encoding;
-
if (isalpha(quote)) {
if (quote == 'b' || quote == 'B') {
quote = *++s;
@@ -3233,7 +3232,7 @@
}
}
if (!*bytesmode && !rawmode) {
- return decode_unicode(s, len, rawmode, encoding);
+ return decode_unicode(s, len, rawmode, c->c_encoding);
}
if (*bytesmode) {
/* Disallow non-ascii characters (but not escapes) */
@@ -3246,28 +3245,27 @@
}
}
}
- need_encoding = (!*bytesmode && encoding != NULL &&
- strcmp(encoding, "utf-8") != 0 &&
- strcmp(encoding, "iso-8859-1") != 0);
+ need_encoding = (!*bytesmode && c->c_encoding != NULL &&
+ strcmp(c->c_encoding, "utf-8") != 0 &&
+ strcmp(c->c_encoding, "iso-8859-1") != 0);
if (rawmode || strchr(s, '\\') == NULL) {
if (need_encoding) {
PyObject *v, *u = PyUnicode_DecodeUTF8(s, len, NULL);
if (u == NULL || !*bytesmode)
return u;
- v = PyUnicode_AsEncodedString(u, encoding, NULL);
+ v = PyUnicode_AsEncodedString(u, c->c_encoding, NULL);
Py_DECREF(u);
return v;
} else if (*bytesmode) {
return PyString_FromStringAndSize(s, len);
- } else if (strcmp(encoding, "utf-8") == 0) {
+ } else if (strcmp(c->c_encoding, "utf-8") == 0) {
return PyUnicode_FromStringAndSize(s, len);
} else {
return PyUnicode_DecodeLatin1(s, len, NULL);
}
}
-
return PyString_DecodeEscape(s, len, NULL, 1,
- need_encoding ? encoding : NULL);
+ need_encoding ? c->c_encoding : NULL);
}
/* Build a Python string object out of a STRING+ atom. This takes care of
@@ -3280,13 +3278,13 @@
PyObject *v;
int i;
REQ(CHILD(n, 0), STRING);
- v = parsestr(CHILD(n, 0), c->c_encoding, bytesmode);
+ v = parsestr(c, CHILD(n, 0), bytesmode);
if (v != NULL) {
/* String literal concatenation */
for (i = 1; i < NCH(n); i++) {
PyObject *s;
int subbm = 0;
- s = parsestr(CHILD(n, i), c->c_encoding, &subbm);
+ s = parsestr(c, CHILD(n, i), &subbm);
if (s == NULL)
goto onError;
if (*bytesmode != subbm) {
Modified: python/branches/py3k/Python/future.c
==============================================================================
--- python/branches/py3k/Python/future.c (original)
+++ python/branches/py3k/Python/future.c Wed Mar 26 23:34:47 2008
@@ -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");
Modified: python/branches/py3k/Python/import.c
==============================================================================
--- python/branches/py3k/Python/import.c (original)
+++ python/branches/py3k/Python/import.c Wed Mar 26 23:34:47 2008
@@ -821,12 +821,13 @@
{
PyCodeObject *co = NULL;
mod_ty mod;
+ PyCompilerFlags flags;
PyArena *arena = PyArena_New();
if (arena == NULL)
return NULL;
mod = PyParser_ASTFromFile(fp, pathname, NULL,
- Py_file_input, 0, 0, 0,
+ Py_file_input, 0, 0, &flags,
NULL, arena);
if (mod) {
co = PyAST_Compile(mod, pathname, NULL, arena);
Modified: python/branches/py3k/Python/pythonrun.c
==============================================================================
--- python/branches/py3k/Python/pythonrun.c (original)
+++ python/branches/py3k/Python/pythonrun.c Wed Mar 26 23:34:47 2008
@@ -1563,11 +1563,12 @@
{
struct symtable *st;
mod_ty mod;
+ PyCompilerFlags flags;
PyArena *arena = PyArena_New();
if (arena == NULL)
return NULL;
- mod = PyParser_ASTFromString(str, filename, start, NULL, arena);
+ mod = PyParser_ASTFromString(str, filename, start, &flags, arena);
if (mod == NULL) {
PyArena_Free(arena);
return NULL;
@@ -1584,10 +1585,16 @@
{
mod_ty mod;
perrdetail err;
- node *n = PyParser_ParseStringFlagsFilename(s, filename,
+ int iflags;
+ iflags = PARSER_FLAGS(flags);
+
+ node *n = PyParser_ParseStringFlagsFilenameEx(s, filename,
&_PyParser_Grammar, start, &err,
- PARSER_FLAGS(flags));
+ &iflags);
if (n) {
+ if (flags) {
+ flags->cf_flags |= iflags & PyCF_MASK;
+ }
mod = PyAST_FromNode(n, flags, filename, arena);
PyNode_Free(n);
return mod;
@@ -1606,10 +1613,16 @@
{
mod_ty mod;
perrdetail err;
- node *n = PyParser_ParseFileFlags(fp, filename, enc,
+ int iflags;
+
+ iflags = PARSER_FLAGS(flags);
+ node *n = PyParser_ParseFileFlagsEx(fp, filename, enc,
&_PyParser_Grammar,
- start, ps1, ps2, &err, PARSER_FLAGS(flags));
+ start, ps1, ps2, &err, &iflags);
if (n) {
+ if (flags) {
+ flags->cf_flags |= iflags & PyCF_MASK;
+ }
mod = PyAST_FromNode(n, flags, filename, arena);
PyNode_Free(n);
return mod;
More information about the Python-3000-checkins
mailing list