[Python-checkins] r71345 - in python/branches/release26-maint: Include/patchlevel.h Lib/distutils/__init__.py Lib/idlelib/idlever.py Lib/optparse.py Misc/NEWS Misc/RPM/python-2.6.spec README

[barry.warsaw]

Author: barry.warsaw
Date: Tue Apr  7 03:54:02 2009
New Revision: 71345

Log:
Bump to 2.6.2c1.


Modified:
   python/branches/release26-maint/Include/patchlevel.h
   python/branches/release26-maint/Lib/distutils/__init__.py
   python/branches/release26-maint/Lib/idlelib/idlever.py
   python/branches/release26-maint/Lib/optparse.py
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/Misc/RPM/python-2.6.spec
   python/branches/release26-maint/README

Modified: python/branches/release26-maint/Include/patchlevel.h
==============================================================================
--- python/branches/release26-maint/Include/patchlevel.h	(original)
+++ python/branches/release26-maint/Include/patchlevel.h	Tue Apr  7 03:54:02 2009
@@ -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) */

Modified: python/branches/release26-maint/Lib/distutils/__init__.py
==============================================================================
--- python/branches/release26-maint/Lib/distutils/__init__.py	(original)
+++ python/branches/release26-maint/Lib/distutils/__init__.py	Tue Apr  7 03:54:02 2009
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6.1"
+__version__ = "2.6.2c1"
 #--end constants--

Modified: python/branches/release26-maint/Lib/idlelib/idlever.py
==============================================================================
--- python/branches/release26-maint/Lib/idlelib/idlever.py	(original)
+++ python/branches/release26-maint/Lib/idlelib/idlever.py	Tue Apr  7 03:54:02 2009
@@ -1 +1 @@
-IDLE_VERSION = "2.6.1"
+IDLE_VERSION = "2.6.2c1"

Modified: python/branches/release26-maint/Lib/optparse.py
==============================================================================
--- python/branches/release26-maint/Lib/optparse.py	(original)
+++ python/branches/release26-maint/Lib/optparse.py	Tue Apr  7 03:54:02 2009
@@ -995,7 +995,7 @@
         """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]

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Tue Apr  7 03:54:02 2009
@@ -4,10 +4,10 @@
 
 (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 @@
 
 - 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 @@
 - 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 @@
 
 - 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 @@
   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.

Modified: python/branches/release26-maint/Misc/RPM/python-2.6.spec
==============================================================================
--- python/branches/release26-maint/Misc/RPM/python-2.6.spec	(original)
+++ python/branches/release26-maint/Misc/RPM/python-2.6.spec	Tue Apr  7 03:54:02 2009
@@ -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

Modified: python/branches/release26-maint/README
==============================================================================
--- python/branches/release26-maint/README	(original)
+++ python/branches/release26-maint/README	Tue Apr  7 03:54:02 2009
@@ -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