summaryrefslogtreecommitdiff
path: root/Parser/parsetok.c
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2008-03-26 23:24:27 +0000
committerChristian Heimes <christian@cheimes.de>2008-03-26 23:24:27 +0000
commitb1b3efc5049472829f586a57aa248afc131759cf (patch)
tree61f981bc0d4a0a2fafe59b23c7a92481ed1fda1f /Parser/parsetok.c
parent4d6ec85a022d05f11966004edc36151ab26bb13a (diff)
downloadcpython-git-b1b3efc5049472829f586a57aa248afc131759cf.tar.gz
Merged revisions 61954,61956-61957 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r61954 | christian.heimes | 2008-03-26 23:20:26 +0100 (Wed, 26 Mar 2008) | 1 line Surround p_flags access with #ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD ........ r61956 | christian.heimes | 2008-03-26 23:51:58 +0100 (Wed, 26 Mar 2008) | 1 line Initialize PyCompilerFlags cf_flags with 0 ........ r61957 | christian.heimes | 2008-03-26 23:55:31 +0100 (Wed, 26 Mar 2008) | 1 line I forgot to svn add the future test ........
Diffstat (limited to 'Parser/parsetok.c')
-rw-r--r--Parser/parsetok.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/Parser/parsetok.c b/Parser/parsetok.c
index 873be973ce..c6be8f9f2c 100644
--- a/Parser/parsetok.c
+++ b/Parser/parsetok.c
@@ -225,6 +225,7 @@ parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret,
}
else
n = NULL;
+
#ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD
*flags = ps->p_flags;
#endif