From 46ea4f73b998364e020972eb80415e6004a917f2 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sat, 27 Jun 2009 21:40:27 +0000 Subject: [PATCH] bump to 3.2a0 --- Doc/license.rst | 5 ++++- Doc/tutorial/interpreter.rst | 8 +++---- Include/patchlevel.h | 4 ++-- LICENSE | 2 ++ Lib/distutils/__init__.py | 2 +- Lib/idlelib/idlever.py | 2 +- Misc/NEWS | 12 ++++++++++ Misc/RPM/{python-3.1.spec => python-3.2.spec} | 4 ++-- README | 2 +- configure | 22 +++++++++---------- configure.in | 2 +- 11 files changed, 41 insertions(+), 24 deletions(-) rename Misc/RPM/{python-3.1.spec => python-3.2.spec} (99%) diff --git a/Doc/license.rst b/Doc/license.rst index eb266a7b34a..7b77b60682f 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -94,7 +94,10 @@ been GPL-compatible; the table below summarizes the various releases. +----------------+--------------+------------+------------+-----------------+ | 3.0 | 2.6 | 2008 | PSF | yes | +----------------+--------------+------------+------------+-----------------+ - +| 3.1 | 3.0 | 2009 | PSF | yes | ++----------------+--------------+------------+------------+-----------------+ +| 3.2 | 3.1 | 2009 | PSF | yes | ++----------------+--------------+------------+------------+-----------------+ .. note:: diff --git a/Doc/tutorial/interpreter.rst b/Doc/tutorial/interpreter.rst index 72cbec9151f..43b42af40a5 100644 --- a/Doc/tutorial/interpreter.rst +++ b/Doc/tutorial/interpreter.rst @@ -10,11 +10,11 @@ Using the Python Interpreter Invoking the Interpreter ======================== -The Python interpreter is usually installed as :file:`/usr/local/bin/python3.1` +The Python interpreter is usually installed as :file:`/usr/local/bin/python3.2` on those machines where it is available; putting :file:`/usr/local/bin` in your Unix shell's search path makes it possible to start it by typing the command :: - python3.1 + python3.2 to the shell. [#]_ Since the choice of the directory where the interpreter lives is an installation option, other places are possible; check with your local @@ -22,11 +22,11 @@ Python guru or system administrator. (E.g., :file:`/usr/local/python` is a popular alternative location.) On Windows machines, the Python installation is usually placed in -:file:`C:\\Python31`, though you can change this when you're running the +:file:`C:\\Python32`, though you can change this when you're running the installer. To add this directory to your path, you can type the following command into the command prompt in a DOS box:: - set path=%path%;C:\python31 + set path=%path%;C:\python32 Typing an end-of-file character (:kbd:`Control-D` on Unix, :kbd:`Control-Z` on Windows) at the primary prompt causes the interpreter to exit with a zero exit diff --git a/Include/patchlevel.h b/Include/patchlevel.h index 8d21ce10ee5..43e93d3ef9f 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -19,11 +19,11 @@ #define PY_MAJOR_VERSION 3 #define PY_MINOR_VERSION 1 #define PY_MICRO_VERSION 0 -#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL +#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_ALPHA #define PY_RELEASE_SERIAL 0 /* Version as a string */ -#define PY_VERSION "3.1" +#define PY_VERSION "3.1a0+" /*--end constants--*/ /* Subversion Revision number of this file (not of the repository) */ diff --git a/LICENSE b/LICENSE index d5974784135..7a3857e0ff3 100644 --- a/LICENSE +++ b/LICENSE @@ -60,6 +60,8 @@ the various releases. 2.6 2.5 2008 PSF yes 2.6.1 2.6 2008 PSF yes 3.0 2.6 2008 PSF yes + 3.1 3.0 2009 PSF yes + 3.2 3.1 2009 PSF yes Footnotes: diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py index 73c77f1fa6e..18b02fc6291 100644 --- a/Lib/distutils/__init__.py +++ b/Lib/distutils/__init__.py @@ -15,5 +15,5 @@ __revision__ = "$Id$" # Updated automatically by the Python release process. # #--start constants-- -__version__ = "3.1" +__version__ = "3.2a0" #--end constants-- diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py index c3314d562a8..3ca3cdebba7 100644 --- a/Lib/idlelib/idlever.py +++ b/Lib/idlelib/idlever.py @@ -1 +1 @@ -IDLE_VERSION = "3.1" +IDLE_VERSION = "3.2a0" diff --git a/Misc/NEWS b/Misc/NEWS index 32101b546e5..b4b9e9ff29b 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -4,6 +4,18 @@ Python News (editors: check NEWS.help for information about editing NEWS using ReST.) +What's New in Python 3.2 Alpha 1? +================================= + +*Release date: XX-XXX-XXX* + +Core and Builtins +----------------- + +Library +------- + + What's New in Python 3.1? ========================= diff --git a/Misc/RPM/python-3.1.spec b/Misc/RPM/python-3.2.spec similarity index 99% rename from Misc/RPM/python-3.1.spec rename to Misc/RPM/python-3.2.spec index 074f958ffdb..e794623c904 100644 --- a/Misc/RPM/python-3.1.spec +++ b/Misc/RPM/python-3.2.spec @@ -34,8 +34,8 @@ %define name python #--start constants-- -%define version 3.1 -%define libver 3.1 +%define version 3.2a0 +%define libver 3.2 #--end constants-- %define release 1pydotorg %define __prefix /usr diff --git a/README b/README index 40d3f0a67bb..72f9a54f308 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -This is Python version 3.1 +This is Python version 3.2 ========================== Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 diff --git a/configure b/configure index 9d3c9a91f06..31e766298c2 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Revision: 73274 . +# From configure.in Revision: 73307 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for python 3.1. +# Generated by GNU Autoconf 2.61 for python 3.2. # # Report bugs to . # @@ -575,8 +575,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='python' PACKAGE_TARNAME='python' -PACKAGE_VERSION='3.1' -PACKAGE_STRING='python 3.1' +PACKAGE_VERSION='3.2' +PACKAGE_STRING='python 3.2' PACKAGE_BUGREPORT='http://bugs.python.org/' ac_unique_file="Include/object.h" @@ -1246,7 +1246,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures python 3.1 to adapt to many kinds of systems. +\`configure' configures python 3.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1307,7 +1307,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of python 3.1:";; + short | recursive ) echo "Configuration of python 3.2:";; esac cat <<\_ACEOF @@ -1438,7 +1438,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -python configure 3.1 +python configure 3.2 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1452,7 +1452,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by python $as_me 3.1, which was +It was created by python $as_me 3.2, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1826,7 +1826,7 @@ rm confdefs.h mv confdefs.h.new confdefs.h -VERSION=3.1 +VERSION=3.2 SOVERSION=1.0 @@ -25817,7 +25817,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by python $as_me 3.1, which was +This file was extended by python $as_me 3.2, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25866,7 +25866,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -python config.status 3.1 +python config.status 3.2 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index ecd789a9098..7b1cab8da21 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl *********************************************** dnl NOTE: autoconf 2.64 doesn't seem to work (use 2.61). # Set VERSION so we only need to edit in one place (i.e., here) -m4_define(PYTHON_VERSION, 3.1) +m4_define(PYTHON_VERSION, 3.2) AC_REVISION($Revision$) AC_PREREQ(2.61)