Bump to 2.6.2c1.

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 5ce83bc9beead5219a26a64569e93789e2cb80ee..f218bbeea33af802b988ba7debe2c2e8617d3528 100644 (file)
--- 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 8f7eb8427d2d08377eba6de500e2bdbbdd3b5482..e8f55cf0877a9e4ffc6498940cb12f5e202ec4aa 100644 (file)
--- 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 203526730b7da48c7e3b9fa8b1a1c6888669ea4d..9cc5850b2386385e0ae1019d2b1fcc938de55899 100644 (file)
--- 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 56b05d68a1c322c2369ebbcf28a66f6c48701076..4a74a684c9c044053a2da79cc4ac9dfb9b9cdb28 100644 (file)
--- 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 bf0eec86218751752b2a2af5d435b8320ab32cce..3c75497409ae536307efecf512d430b20bb50735 100644 (file)
--- 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 d57c65de2d2214f331972aee72c9f6042e455fb7..134044ad9fac6f87b0ae31627fbfc7924212c1c4 100644 (file)
--- 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 5f14aa29932f698a8007b51a7f7088c3de871ebc..eed85c07cf084cec29631aa07539f9a2b6144550 100644 (file)
--- 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