Skip to content

Commit

Permalink
Bump trunk to 3.3 alpha 0.
Browse files Browse the repository at this point in the history
  • Loading branch information
birkenfeld committed Feb 20, 2011
1 parent 4a9d447 commit 3ebb6b3
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 30 deletions.
2 changes: 2 additions & 0 deletions Doc/license.rst
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ been GPL-compatible; the table below summarizes the various releases.
+----------------+--------------+------------+------------+-----------------+
| 3.2 | 3.1 | 2011 | PSF | yes |
+----------------+--------------+------------+------------+-----------------+
| 3.3 | 3.2 | 2012 | PSF | yes |
+----------------+--------------+------------+------------+-----------------+

.. note::

Expand Down
14 changes: 7 additions & 7 deletions Doc/tutorial/interpreter.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ Using the Python Interpreter
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
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:\\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
Expand Down Expand Up @@ -94,8 +94,8 @@ with the *secondary prompt*, by default three dots (``...``). The interpreter
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.
>>>
Expand Down Expand Up @@ -148,7 +148,7 @@ Executable Python Scripts
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
Expand Down
2 changes: 1 addition & 1 deletion Doc/tutorial/stdlib.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ operating system::

>>> 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
Expand Down
2 changes: 1 addition & 1 deletion Doc/tutorial/stdlib2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ applications include caching objects that are expensive to create::
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'

Expand Down
6 changes: 3 additions & 3 deletions Include/patchlevel.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) */
Expand Down
1 change: 1 addition & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ the various releases.
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:

Expand Down
2 changes: 1 addition & 1 deletion Lib/distutils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
# Updated automatically by the Python release process.
#
#--start constants--
__version__ = "3.2"
__version__ = "3.3a0"
#--end constants--
2 changes: 1 addition & 1 deletion Lib/idlelib/idlever.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
IDLE_VERSION = "3.2"
IDLE_VERSION = "3.3a0"
6 changes: 6 additions & 0 deletions Misc/NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -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?
=========================

Expand Down
4 changes: 2 additions & 2 deletions Misc/RPM/python-3.3.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
22 changes: 11 additions & 11 deletions configure
Original file line number Diff line number Diff line change
@@ -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/>.
#
Expand Down Expand Up @@ -561,8 +561,8 @@ MAKEFLAGS=
# 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=''

Expand Down Expand Up @@ -1317,7 +1317,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.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]...
Expand Down Expand Up @@ -1378,7 +1378,7 @@ fi

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
Expand Down Expand Up @@ -1516,7 +1516,7 @@ fi
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.
Expand Down Expand Up @@ -2347,7 +2347,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.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 $@
Expand Down Expand Up @@ -2714,7 +2714,7 @@ rm confdefs.h
mv confdefs.h.new confdefs.h
VERSION=3.2
VERSION=3.3
# Version number of Python's own shared library file.
Expand Down Expand Up @@ -14311,7 +14311,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.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
Expand Down Expand Up @@ -14373,7 +14373,7 @@ _ACEOF
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\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ dnl * Please run autoreconf to test your changes! *
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.
Expand Down

0 comments on commit 3ebb6b3

Please sign in to comment.