diff options
| author | Barry Warsaw <barry@python.org> | 2011-05-23 15:22:56 -0400 |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2011-05-23 15:22:56 -0400 |
| commit | cf0d8ab818852503057b8ade6cccc403fbb5d2be (patch) | |
| tree | 8fcd89ece63691dade1d0c0f5c78f5b70eb84880 /Python | |
| parent | e26bc109ffe4ca1c0cb73270d6f8662e6191cb40 (diff) | |
| download | cpython-git-cf0d8ab818852503057b8ade6cccc403fbb5d2be.tar.gz | |
Replay changeset 70238:03e488b5c009 from fubar branch. Original commit
message:
Reconcile with the 2.6svn branch. The 2.6.7 release will be made from
Subversion, but there were differences, so this brings them in sync. These
changes should *not* propagate to any newer versions.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/Python-ast.c | 4 | ||||
| -rw-r--r-- | Python/getcopyright.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Python/Python-ast.c b/Python/Python-ast.c index bc6cca0635..45fe444e26 100644 --- a/Python/Python-ast.c +++ b/Python/Python-ast.c @@ -2,7 +2,7 @@ /* - __version__ 62047. + __version__ . This module must be committed separately after each AST grammar change; The __version__ number is set to the revision number of the commit @@ -6300,7 +6300,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__", "62047") < 0) + if (PyModule_AddStringConstant(m, "__version__", "") < 0) return; if (PyDict_SetItemString(d, "mod", (PyObject*)mod_type) < 0) return; if (PyDict_SetItemString(d, "Module", (PyObject*)Module_type) < 0) diff --git a/Python/getcopyright.c b/Python/getcopyright.c index a5e7fa6396..824c7b1c82 100644 --- a/Python/getcopyright.c +++ b/Python/getcopyright.c @@ -4,7 +4,7 @@ static char cprt[] = "\ -Copyright (c) 2001-2010 Python Software Foundation.\n\ +Copyright (c) 2001-2011 Python Software Foundation.\n\ All Rights Reserved.\n\ \n\ Copyright (c) 2000 BeOpen.com.\n\ |