Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/README.txt
View File

@ -127,7 +127,7 @@ The Python source is copyrighted, but you can freely use and copy it
as long as you don't change or remove the copyright notice:
----------------------------------------------------------------------
Copyright (c) 2000-2008 Python Software Foundation.
Copyright (c) 2000-2011 Python Software Foundation.
All rights reserved.
Copyright (c) 2000 BeOpen.com.

2
Doc/copyright.rst
View File

@ -4,7 +4,7 @@ Copyright
Python and this documentation is:
Copyright © 2001-2010 Python Software Foundation. All rights reserved.
Copyright © 2001-2011 Python Software Foundation. All rights reserved.
Copyright © 2000 BeOpen.com. All rights reserved.

12
Doc/library/configparser.rst
View File

@ -79,12 +79,9 @@ write-back, as will be the keys within each section.
The basic configuration object. When *defaults* is given, it is initialized
into the dictionary of intrinsic defaults. When *dict_type* is given, it will
be used to create the dictionary objects for the list of sections, for the
options within a section, and for the default values. This class does not
options within a section, and for the default values. This class does not
support the magical interpolation behavior.
All option names are passed through the :meth:`optionxform` method. Its
default implementation converts option names to lower case.
.. versionadded:: 2.3
.. versionchanged:: 2.6
@ -101,9 +98,10 @@ write-back, as will be the keys within each section.
*defaults*.
All option names used in interpolation will be passed through the
:meth:`optionxform` method just like any other option name reference. Using
the default implementation of :meth:`optionxform`, the values ``foo %(bar)s``
and ``foo %(BAR)s`` are equivalent.
:meth:`optionxform` method just like any other option name reference. For
example, using the default implementation of :meth:`optionxform` (which converts
option names to lower case), the values ``foo %(bar)s`` and ``foo %(BAR)s`` are
equivalent.
.. class:: SafeConfigParser([defaults[, dict_type]])

4
Doc/library/logging.rst
View File

@ -2545,8 +2545,6 @@ logging module using these functions or by making calls to the main API (defined
in :mod:`logging` itself) and defining handlers which are declared either in
:mod:`logging` or :mod:`logging.handlers`.
.. currentmodule:: logging.config
.. function:: fileConfig(fname[, defaults])
@ -2580,8 +2578,6 @@ in :mod:`logging` itself) and defining handlers which are declared either in
:func:`listen`.
.. currentmodule:: logging
.. _logging-config-fileformat:
Configuration file format

4
Doc/license.rst
View File

@ -104,6 +104,10 @@ been GPL-compatible; the table below summarizes the various releases.
+----------------+--------------+-----------+------------+-----------------+
| 2.6.5 | 2.6.4 | 2010 | PSF | yes |
+----------------+--------------+-----------+------------+-----------------+
| 2.6.6 | 2.6.5 | 2010 | PSF | yes |
+----------------+--------------+-----------+------------+-----------------+
| 2.6.7 | 2.6.6 | 2011 | PSF | yes |
+----------------+--------------+-----------+------------+-----------------+
.. note::

8
Include/patchlevel.h
View File

@ -22,12 +22,12 @@
/*--start constants--*/
#define PY_MAJOR_VERSION 2
#define PY_MINOR_VERSION 6
#define PY_MICRO_VERSION 6
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
#define PY_RELEASE_SERIAL 0
#define PY_MICRO_VERSION 7
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA
#define PY_RELEASE_SERIAL 1
/* Version as a string */
#define PY_VERSION "2.6.6+"
#define PY_VERSION "2.6.7rc1"
/*--end constants--*/
/* Subversion Revision number of this file (not of the repository) */

2
LICENSE
View File

@ -63,6 +63,8 @@ the various releases.
2.6.3 2.6.2 2009 PSF yes
2.6.4 2.6.3 2009 PSF yes
2.6.5 2.6.4 2010 PSF yes
2.6.6 2.6.5 2010 PSF yes
2.6.7 2.6.6 2011 PSF yes
Footnotes:

2
Lib/distutils/__init__.py
View File

@ -22,5 +22,5 @@ __revision__ = "$Id$"
#
#--start constants--
__version__ = "2.6.6"
__version__ = "2.6.7rc1"
#--end constants--

2
Lib/idlelib/idlever.py
View File

@ -1 +1 @@
IDLE_VERSION = "2.6.6"
IDLE_VERSION = "2.6.7rc1"

2
Lib/pydoc_topics.py
View File

File diff suppressed because one or more lines are too long

23
Misc/NEWS
View File

@ -4,10 +4,10 @@ Python News
(editors: check NEWS.help for information about editing NEWS using ReST.)
What's New in Python 2.6.7?
===========================
What's New in Python 2.6.7 rc 1?
================================
*Release date: XXXX-XX-XX*
*Release date: 2011-05-06*
*NOTE: Python 2.6 is in security-fix-only mode. No non-security bug fixes are
allowed. Python 2.6.7 and beyond will be source only releases.*
@ -19,11 +19,20 @@ Core and Builtins
Library
-------
- Issue #11442: Add a charset parameter to the Content-type in SimpleHTTPServer
to avoid XSS attacks.
- Issue #9129: smtpd.py is vulnerable to DoS attacks deriving from missing
error handling when accepting a new connection.
- Issue #11662: Make urllib and urllib2 ignore redirections if the
scheme is not HTTP, HTTPS or FTP (CVE-2011-1521).
What's New in Python 2.6.6?
===========================
*Release date: 2010-08-24*
Core and Builtins
-----------------
Library
-------
What's New in Python 2.6.6 rc 2?

2
Misc/RPM/python-2.6.spec
View File

@ -39,7 +39,7 @@
%define name python
#--start constants--
%define version 2.6.6
%define version 2.6.7rc1
%define libver 2.6
#--end constants--
%define release 1pydotorg

2
PC/python_nt.rc
View File

@ -61,7 +61,7 @@ BEGIN
VALUE "FileDescription", "Python Core\0"
VALUE "FileVersion", PYTHON_VERSION
VALUE "InternalName", "Python DLL\0"
VALUE "LegalCopyright", "Copyright © 2001-2010 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0"
VALUE "LegalCopyright", "Copyright © 2001-2011 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0"
VALUE "OriginalFilename", PYTHON_DLL_NAME "\0"
VALUE "ProductName", "Python\0"
VALUE "ProductVersion", PYTHON_VERSION

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\

7
README
View File

@ -1,8 +1,9 @@
This is Python version 2.6.6
============================
This is Python version 2.6.7rc1
===============================
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
Python Software Foundation. All rights reserved.
Python Software Foundation.
All rights reserved.
Copyright (c) 2000 BeOpen.com.
All rights reserved.