Bump trunk to 3.3 alpha 0.
diff --git a/Doc/license.rst b/Doc/license.rst
index a32b7ab..6c9ecf5 100644
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -110,6 +110,8 @@
+----------------+--------------+------------+------------+-----------------+
| 3.2 | 3.1 | 2011 | PSF | yes |
+----------------+--------------+------------+------------+-----------------+
+| 3.3 | 3.2 | 2012 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
.. note::
diff --git a/Doc/tutorial/interpreter.rst b/Doc/tutorial/interpreter.rst
index 8d743de..eeddf76 100644
--- a/Doc/tutorial/interpreter.rst
+++ b/Doc/tutorial/interpreter.rst
@@ -10,11 +10,11 @@
Invoking the Interpreter
========================
-The Python interpreter is usually installed as :file:`/usr/local/bin/python3.2`
+The Python interpreter is usually installed as :file:`/usr/local/bin/python3.3`
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.2
+ python3.3
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 @@
popular alternative location.)
On Windows machines, the Python installation is usually placed in
-:file:`C:\\Python32`, though you can change this when you're running the
+:file:`C:\\Python33`, 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:\python32
+ set path=%path%;C:\python33
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
@@ -94,8 +94,8 @@
prints a welcome message stating its version number and a copyright notice
before printing the first prompt::
- $ python3.2
- Python 3.2 (py3k, Sep 12 2007, 12:21:02)
+ $ python3.3
+ Python 3.3 (py3k, Sep 12 2007, 12:21:02)
[GCC 3.4.6 20060404 (Red Hat 3.4.6-8)] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>>
@@ -148,7 +148,7 @@
On BSD'ish Unix systems, Python scripts can be made directly executable, like
shell scripts, by putting the line ::
- #! /usr/bin/env python3.2
+ #! /usr/bin/env python3.3
(assuming that the interpreter is on the user's :envvar:`PATH`) at the beginning
of the script and giving the file an executable mode. The ``#!`` must be the
diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
index 9729743..500ca7f 100644
--- a/Doc/tutorial/stdlib.rst
+++ b/Doc/tutorial/stdlib.rst
@@ -15,7 +15,7 @@
>>> import os
>>> os.getcwd() # Return the current working directory
- 'C:\\Python31'
+ 'C:\\Python33'
>>> os.chdir('/server/accesslogs') # Change current working directory
>>> os.system('mkdir today') # Run the command mkdir in the system shell
0
diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst
index fe7f027..603f143 100644
--- a/Doc/tutorial/stdlib2.rst
+++ b/Doc/tutorial/stdlib2.rst
@@ -271,7 +271,7 @@
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
d['primary'] # entry was automatically removed
- File "C:/python31/lib/weakref.py", line 46, in __getitem__
+ File "C:/python33/lib/weakref.py", line 46, in __getitem__
o = self.data[key]()
KeyError: 'primary'
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index d0a5a25..eacf840 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -17,13 +17,13 @@
/* Version parsed out into numeric values */
/*--start constants--*/
#define PY_MAJOR_VERSION 3
-#define PY_MINOR_VERSION 2
+#define PY_MINOR_VERSION 3
#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.2"
+#define PY_VERSION "3.3a0"
/*--end constants--*/
/* Subversion Revision number of this file (not of the repository) */
diff --git a/LICENSE b/LICENSE
index 341de15..d3cde01 100644
--- a/LICENSE
+++ b/LICENSE
@@ -69,6 +69,7 @@
3.1.1 3.1 2009 PSF yes
3.1.2 3.1 2010 PSF yes
3.2 3.1 2011 PSF yes
+ 3.3 3.2 2012 PSF yes
Footnotes:
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
index 49b6d51..bd7d9dd 100644
--- a/Lib/distutils/__init__.py
+++ b/Lib/distutils/__init__.py
@@ -15,5 +15,5 @@
# Updated automatically by the Python release process.
#
#--start constants--
-__version__ = "3.2"
+__version__ = "3.3a0"
#--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
index 5b0907e..5e9afb1 100644
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "3.2"
+IDLE_VERSION = "3.3a0"
diff --git a/Misc/NEWS b/Misc/NEWS
index c34a540..4c51246 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2,6 +2,12 @@
Python News
+++++++++++
+What's New in Python 3.3 Alpha 1?
+=================================
+
+*Release date: XX-XXX-20XX*
+
+
What's New in Python 3.2?
=========================
diff --git a/Misc/RPM/python-3.3.spec b/Misc/RPM/python-3.3.spec
index a5ecdc7..4882fbb 100644
--- a/Misc/RPM/python-3.3.spec
+++ b/Misc/RPM/python-3.3.spec
@@ -39,8 +39,8 @@
%define name python
#--start constants--
-%define version 3.2
-%define libvers 3.2
+%define version 3.3a0
+%define libvers 3.3
#--end constants--
%define release 1pydotorg
%define __prefix /usr
diff --git a/README b/README
index 5215aef..2623e5a 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-This is Python version 3.2
-==========================
+This is Python version 3.3 alpha 0
+==================================
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
Python Software Foundation. All rights reserved.
diff --git a/configure b/configure
index 96747ff..8e46152 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.in Revision: 88430 .
+# From configure.in Revision: 88440 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for python 3.2.
+# Generated by GNU Autoconf 2.68 for python 3.3.
#
# Report bugs to <http://bugs.python.org/>.
#
@@ -561,8 +561,8 @@
# Identity of this package.
PACKAGE_NAME='python'
PACKAGE_TARNAME='python'
-PACKAGE_VERSION='3.2'
-PACKAGE_STRING='python 3.2'
+PACKAGE_VERSION='3.3'
+PACKAGE_STRING='python 3.3'
PACKAGE_BUGREPORT='http://bugs.python.org/'
PACKAGE_URL=''
@@ -1317,7 +1317,7 @@
# 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.2 to adapt to many kinds of systems.
+\`configure' configures python 3.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1378,7 +1378,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of python 3.2:";;
+ short | recursive ) echo "Configuration of python 3.3:";;
esac
cat <<\_ACEOF
@@ -1516,7 +1516,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-python configure 3.2
+python configure 3.3
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2347,7 +2347,7 @@
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.2, which was
+It was created by python $as_me 3.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2714,7 +2714,7 @@
mv confdefs.h.new confdefs.h
-VERSION=3.2
+VERSION=3.3
# Version number of Python's own shared library file.
@@ -14311,7 +14311,7 @@
# 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.2, which was
+This file was extended by python $as_me 3.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14373,7 +14373,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-python config.status 3.2
+python config.status 3.3
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.in b/configure.in
index 6f4ffa5..2d4b200 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@
dnl ***********************************************
# Set VERSION so we only need to edit in one place (i.e., here)
-m4_define(PYTHON_VERSION, 3.2)
+m4_define(PYTHON_VERSION, 3.3)
dnl Some m4 magic to ensure that the configure script is generated
dnl by the correct autoconf version.