summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2007-02-11 23:06:17 (GMT)
committerGeorg Brandl <georg@python.org>2007-02-11 23:06:17 (GMT)
commitc2d9d7f489d9b7685d0a500a86669f9637b07255 (patch)
tree413fbceb2f749d165d8782730d02b87d9f9a4815
parent07f2436fa864c5a09150c8f0b250640f267f01bf (diff)
downloadcpython-c2d9d7f489d9b7685d0a500a86669f9637b07255.zip
cpython-c2d9d7f489d9b7685d0a500a86669f9637b07255.tar.gz
cpython-c2d9d7f489d9b7685d0a500a86669f9637b07255.tar.bz2
Checkin the regenerated Python-ast.c and fix test_optparse.
-rw-r--r--Lib/optparse.py3
-rw-r--r--Python/Python-ast.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/Lib/optparse.py b/Lib/optparse.py
index 5122e49..8e1ef52 100644
--- a/Lib/optparse.py
+++ b/Lib/optparse.py
@@ -611,8 +611,7 @@ class Option:
else:
setattr(self, attr, None)
if attrs:
- attrs = attrs.keys()
- attrs.sort()
+ attrs = sorted(attrs.keys())
raise OptionError(
"invalid keyword arguments: %s" % ", ".join(attrs),
self)
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index d0b4b29..13fc5e0 100644
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -3080,7 +3080,7 @@ init_ast(void)
if (PyDict_SetItemString(d, "AST", (PyObject*)AST_type) < 0) return;
if (PyModule_AddIntConstant(m, "PyCF_ONLY_AST", PyCF_ONLY_AST) < 0)
return;
- if (PyModule_AddStringConstant(m, "__version__", "53349") < 0)
+ if (PyModule_AddStringConstant(m, "__version__", "53704") < 0)
return;
if (PyDict_SetItemString(d, "mod", (PyObject*)mod_type) < 0) return;
if (PyDict_SetItemString(d, "Module", (PyObject*)Module_type) < 0)