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

Bump to 2.6.2c1.

This commit is contained in:
Barry Warsaw 2009-04-07 01:54:02 +00:00
parent 2b48573794
commit 90971e0cd2
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Include/patchlevel.h
View File

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

2
Lib/distutils/__init__.py
View File

@ -22,5 +22,5 @@ __revision__ = "$Id$"
# #
#--start constants-- #--start constants--
__version__ = "2.6.1" __version__ = "2.6.2c1"
#--end constants-- #--end constants--

2
Lib/idlelib/idlever.py
View File

@ -1 +1 @@
IDLE_VERSION = "2.6.1" IDLE_VERSION = "2.6.2c1"

2
Lib/optparse.py
View File

@ -995,7 +995,7 @@ class OptionContainer:
"""add_option(Option) """add_option(Option)
add_option(opt_str, ..., kwarg=val, ...) add_option(opt_str, ..., kwarg=val, ...)
""" """
if type(args[0]) is types.StringType: if type(args[0]) in types.StringTypes:
option = self.option_class(*args, **kwargs) option = self.option_class(*args, **kwargs)
elif len(args) == 1 and not kwargs: elif len(args) == 1 and not kwargs:
option = args[0] option = args[0]

26
Misc/NEWS
View File

@ -4,10 +4,10 @@ Python News
(editors: check NEWS.help for information about editing NEWS using ReST.) (editors: check NEWS.help for information about editing NEWS using ReST.)
What's New in Python 2.6.2 What's New in Python 2.6.2 rc 1
========================== ===============================
*Release date: XX-XXX-200X* *Release date: 06-Apr-2009*
Core and Builtins Core and Builtins
----------------- -----------------
@ -19,8 +19,8 @@ Core and Builtins
- Issue #1665206: Remove the last eager import in _warnings.c and make it lazy. - Issue #1665206: Remove the last eager import in _warnings.c and make it lazy.
- Issue #4034: Fix weird attribute error messages of the traceback object. (As a - Issue #4034: Fix weird attribute error messages of the traceback object. (As
result traceback.__members__ no longer exists.) a result traceback.__members__ no longer exists.)
- Issue #5247: Improve error message when unknown format codes are - Issue #5247: Improve error message when unknown format codes are
used when using str.format() with str, unicode, long, int, and used when using str.format() with str, unicode, long, int, and
@ -137,8 +137,8 @@ Library
- Issue #5619: Multiprocessing children disobey the debug flag and causes - Issue #5619: Multiprocessing children disobey the debug flag and causes
popups on windows buildbots. Patch applied to work around this issue. popups on windows buildbots. Patch applied to work around this issue.
- Issue #5632: Thread.ident was None for the main thread and threads not created - Issue #5632: Thread.ident was None for the main thread and threads not
with the threading module. created with the threading module.
- Issue #5400: Added patch for multiprocessing on netbsd compilation/support - Issue #5400: Added patch for multiprocessing on netbsd compilation/support
@ -186,8 +186,8 @@ Library
- Issue #5179: Fixed subprocess handle leak on failure on windows. - Issue #5179: Fixed subprocess handle leak on failure on windows.
- Issue #4308: httplib.IncompleteRead's repr doesn't include all of the data all - Issue #4308: httplib.IncompleteRead's repr doesn't include all of the data
ready received. all ready received.
- Issue #5401: Fixed a performance problem in mimetypes when ``from mimetypes - Issue #5401: Fixed a performance problem in mimetypes when ``from mimetypes
import guess_extension`` was used. import guess_extension`` was used.
@ -217,11 +217,11 @@ Library
function without argtypes (only occurs if HAVE_USABLE_WCHAR_T is false). function without argtypes (only occurs if HAVE_USABLE_WCHAR_T is false).
- Issue #3321: _multiprocessing.Connection() doesn't check handle; added checks - Issue #3321: _multiprocessing.Connection() doesn't check handle; added checks
for *nix machines for negative handles and large int handles. Without this check for *nix machines for negative handles and large int handles. Without this
it is possible to segfault the interpreter. check it is possible to segfault the interpreter.
- Issue #4449: AssertionError in mp_benchmarks.py, caused by an underlying issue - Issue #4449: AssertionError in mp_benchmarks.py, caused by an underlying
in sharedctypes.py. issue in sharedctypes.py.
- Issue #3386: distutils.sysconfig.get_python_lib prefix argument was ignored - Issue #3386: distutils.sysconfig.get_python_lib prefix argument was ignored
under NT and OS2. Patch by Philip Jenvey. under NT and OS2. Patch by Philip Jenvey.

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

@ -34,7 +34,7 @@
%define name python %define name python
#--start constants-- #--start constants--
%define version 2.6.1 %define version 2.6.2c1
%define libver 2.6 %define libver 2.6
#--end constants-- #--end constants--
%define release 1pydotorg %define release 1pydotorg

2
README
View File

@ -1,4 +1,4 @@
This is Python version 2.6.1 This is Python version 2.6.2
============================ ============================
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009