From 90971e0cd278a9697684eff14d741c8de58ae5d4 Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Tue, 7 Apr 2009 01:54:02 +0000 Subject: Bump to 2.6.2c1. --- Include/patchlevel.h | 4 ++-- Lib/distutils/__init__.py | 2 +- Lib/idlelib/idlever.py | 2 +- Lib/optparse.py | 2 +- Misc/NEWS | 26 +++++++++++++------------- Misc/RPM/python-2.6.spec | 2 +- README | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Include/patchlevel.h b/Include/patchlevel.h index 5ce83bc..f218bbe 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -22,12 +22,12 @@ /*--start constants--*/ #define PY_MAJOR_VERSION 2 #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_SERIAL 0 /* Version as a string */ -#define PY_VERSION "2.6.1+" +#define PY_VERSION "2.6.2c1" /*--end constants--*/ /* Subversion Revision number of this file (not of the repository) */ diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py index 8f7eb84..e8f55cf 100644 --- a/Lib/distutils/__init__.py +++ b/Lib/distutils/__init__.py @@ -22,5 +22,5 @@ __revision__ = "$Id$" # #--start constants-- -__version__ = "2.6.1" +__version__ = "2.6.2c1" #--end constants-- diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py index 2035267..9cc5850 100644 --- a/Lib/idlelib/idlever.py +++ b/Lib/idlelib/idlever.py @@ -1 +1 @@ -IDLE_VERSION = "2.6.1" +IDLE_VERSION = "2.6.2c1" diff --git a/Lib/optparse.py b/Lib/optparse.py index 56b05d6..4a74a68 100644 --- a/Lib/optparse.py +++ b/Lib/optparse.py @@ -995,7 +995,7 @@ class OptionContainer: """add_option(Option) 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) elif len(args) == 1 and not kwargs: option = args[0] diff --git a/Misc/NEWS b/Misc/NEWS index bf0eec8..3c75497 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -4,10 +4,10 @@ Python News (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 ----------------- @@ -19,8 +19,8 @@ Core and Builtins - 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 - result traceback.__members__ no longer exists.) +- Issue #4034: Fix weird attribute error messages of the traceback object. (As + a result traceback.__members__ no longer exists.) - Issue #5247: Improve error message when unknown format codes are 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 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 - with the threading module. +- Issue #5632: Thread.ident was None for the main thread and threads not + created with the threading module. - 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 #4308: httplib.IncompleteRead's repr doesn't include all of the data all - ready received. +- Issue #4308: httplib.IncompleteRead's repr doesn't include all of the data + all ready received. - Issue #5401: Fixed a performance problem in mimetypes when ``from mimetypes import guess_extension`` was used. @@ -217,11 +217,11 @@ Library function without argtypes (only occurs if HAVE_USABLE_WCHAR_T is false). - Issue #3321: _multiprocessing.Connection() doesn't check handle; added checks - for *nix machines for negative handles and large int handles. Without this check - it is possible to segfault the interpreter. + for *nix machines for negative handles and large int handles. Without this + check it is possible to segfault the interpreter. -- Issue #4449: AssertionError in mp_benchmarks.py, caused by an underlying issue - in sharedctypes.py. +- Issue #4449: AssertionError in mp_benchmarks.py, caused by an underlying + issue in sharedctypes.py. - Issue #3386: distutils.sysconfig.get_python_lib prefix argument was ignored under NT and OS2. Patch by Philip Jenvey. diff --git a/Misc/RPM/python-2.6.spec b/Misc/RPM/python-2.6.spec index d57c65d..134044a 100644 --- a/Misc/RPM/python-2.6.spec +++ b/Misc/RPM/python-2.6.spec @@ -34,7 +34,7 @@ %define name python #--start constants-- -%define version 2.6.1 +%define version 2.6.2c1 %define libver 2.6 #--end constants-- %define release 1pydotorg diff --git a/README b/README index 5f14aa2..eed85c0 100644 --- a/README +++ b/README @@ -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 -- cgit v0.12