[Python-3000-checkins] r53743 - in python/branches/p3yk: Lib/optparse.py Python/Python-ast.c

[georg.brandl]

Author: georg.brandl
Date: Mon Feb 12 00:06:17 2007
New Revision: 53743

Modified:
   python/branches/p3yk/Lib/optparse.py
   python/branches/p3yk/Python/Python-ast.c
Log:
Checkin the regenerated Python-ast.c and fix test_optparse.



Modified: python/branches/p3yk/Lib/optparse.py
==============================================================================
--- python/branches/p3yk/Lib/optparse.py	(original)
+++ python/branches/p3yk/Lib/optparse.py	Mon Feb 12 00:06:17 2007
@@ -611,8 +611,7 @@
                 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)

Modified: python/branches/p3yk/Python/Python-ast.c
==============================================================================
--- python/branches/p3yk/Python/Python-ast.c	(original)
+++ python/branches/p3yk/Python/Python-ast.c	Mon Feb 12 00:06:17 2007
@@ -3080,7 +3080,7 @@
         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)