mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-14 13:59:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Replay changeset 70238:03e488b5c009 from fubar branch. Original commit

Browse source 
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.
This commit is contained in:
Barry Warsaw 2011-05-23 15:22:56 -04:00
parent e26bc109ff
commit cf0d8ab818
16 changed files with 45 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Python/Python-ast.c
View file

@ -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)

2
Python/getcopyright.c
View file

@ -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\