summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2008-03-31 04:20:05 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2008-03-31 04:20:05 (GMT)
commitdb4115ffc063f20da2c6078bb93187ee8753d4ec (patch)
treeaefc108acfa75b71a627cb7fa3c0cfd6428a8e07 /Include
parent9367c78c84efaa3f2d6797ca7e18dc78e838c531 (diff)
downloadcpython-db4115ffc063f20da2c6078bb93187ee8753d4ec.zip
cpython-db4115ffc063f20da2c6078bb93187ee8753d4ec.tar.gz
cpython-db4115ffc063f20da2c6078bb93187ee8753d4ec.tar.bz2
Merged revisions 62039-62042 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r62039 | georg.brandl | 2008-03-29 06:24:23 -0700 (Sat, 29 Mar 2008) | 3 lines Properly check for consistency with the third argument of compile() when compiling an AST node. ........ r62040 | amaury.forgeotdarc | 2008-03-29 06:47:05 -0700 (Sat, 29 Mar 2008) | 5 lines The buildbot "x86 W2k8 trunk" seems to hang in test_socket. http://www.python.org/dev/buildbot/trunk/x86%20W2k8%20trunk/builds/255/step-test/0 Temporarily increase verbosity of this test. ........ r62042 | amaury.forgeotdarc | 2008-03-29 07:53:05 -0700 (Sat, 29 Mar 2008) | 3 lines Still investigating on the hanging test_socket. the test itself doesn't do anything on windows, focus on setUp and tearDown. ........
Diffstat (limited to 'Include')
-rw-r--r--Include/Python-ast.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Include/Python-ast.h b/Include/Python-ast.h
index c018ddd..6653b08 100644
--- a/Include/Python-ast.h
+++ b/Include/Python-ast.h
@@ -542,5 +542,5 @@ keyword_ty _Py_keyword(identifier arg, expr_ty value, PyArena *arena);
alias_ty _Py_alias(identifier name, identifier asname, PyArena *arena);
PyObject* PyAST_mod2obj(mod_ty t);
-mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena);
+mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode);
int PyAST_Check(PyObject* obj);