mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 13:41:24 +00:00 
			
		
		
		
	Version bump to 3.5, step 2.
This commit is contained in:
		
							parent
							
								
									d922dc4700
								
							
						
					
					
						commit
						f5002bd6ac
					
				
					 11 changed files with 46 additions and 35 deletions
				
			
		|  | @ -10,13 +10,13 @@ Using the Python Interpreter | ||||||
| Invoking the Interpreter | Invoking the Interpreter | ||||||
| ======================== | ======================== | ||||||
| 
 | 
 | ||||||
| The Python interpreter is usually installed as :file:`/usr/local/bin/python3.4` | The Python interpreter is usually installed as :file:`/usr/local/bin/python3.5` | ||||||
| on those machines where it is available; putting :file:`/usr/local/bin` in your | 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: | Unix shell's search path makes it possible to start it by typing the command: | ||||||
| 
 | 
 | ||||||
| .. code-block:: text | .. code-block:: text | ||||||
| 
 | 
 | ||||||
|    python3.4 |    python3.5 | ||||||
| 
 | 
 | ||||||
| to the shell. [#]_ Since the choice of the directory where the interpreter lives | 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 | is an installation option, other places are possible; check with your local | ||||||
|  | @ -24,11 +24,11 @@ Python guru or system administrator.  (E.g., :file:`/usr/local/python` is a | ||||||
| popular alternative location.) | popular alternative location.) | ||||||
| 
 | 
 | ||||||
| On Windows machines, the Python installation is usually placed in | On Windows machines, the Python installation is usually placed in | ||||||
| :file:`C:\\Python34`, though you can change this when you're running the | :file:`C:\\Python35`, though you can change this when you're running the | ||||||
| installer.  To add this directory to your path,  you can type the following | installer.  To add this directory to your path,  you can type the following | ||||||
| command into the command prompt in a DOS box:: | command into the command prompt in a DOS box:: | ||||||
| 
 | 
 | ||||||
|    set path=%path%;C:\python34 |    set path=%path%;C:\python35 | ||||||
| 
 | 
 | ||||||
| Typing an end-of-file character (:kbd:`Control-D` on Unix, :kbd:`Control-Z` on | 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 | Windows) at the primary prompt causes the interpreter to exit with a zero exit | ||||||
|  | @ -95,8 +95,8 @@ with the *secondary prompt*, by default three dots (``...``). The interpreter | ||||||
| prints a welcome message stating its version number and a copyright notice | prints a welcome message stating its version number and a copyright notice | ||||||
| before printing the first prompt:: | before printing the first prompt:: | ||||||
| 
 | 
 | ||||||
|    $ python3.4 |    $ python3.5 | ||||||
|    Python 3.4 (default, Sep 24 2012, 09:25:04) |    Python 3.5 (default, Sep 24 2012, 09:25:04) | ||||||
|    [GCC 4.6.3] on linux2 |    [GCC 4.6.3] on linux2 | ||||||
|    Type "help", "copyright", "credits" or "license" for more information. |    Type "help", "copyright", "credits" or "license" for more information. | ||||||
|    >>> |    >>> | ||||||
|  | @ -149,7 +149,7 @@ Executable Python Scripts | ||||||
| On BSD'ish Unix systems, Python scripts can be made directly executable, like | On BSD'ish Unix systems, Python scripts can be made directly executable, like | ||||||
| shell scripts, by putting the line :: | shell scripts, by putting the line :: | ||||||
| 
 | 
 | ||||||
|    #! /usr/bin/env python3.4 |    #! /usr/bin/env python3.5 | ||||||
| 
 | 
 | ||||||
| (assuming that the interpreter is on the user's :envvar:`PATH`) at the beginning | (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 | of the script and giving the file an executable mode.  The ``#!`` must be the | ||||||
|  |  | ||||||
|  | @ -15,7 +15,7 @@ operating system:: | ||||||
| 
 | 
 | ||||||
|    >>> import os |    >>> import os | ||||||
|    >>> os.getcwd()      # Return the current working directory |    >>> os.getcwd()      # Return the current working directory | ||||||
|    'C:\\Python34' |    'C:\\Python35' | ||||||
|    >>> os.chdir('/server/accesslogs')   # Change current working directory |    >>> os.chdir('/server/accesslogs')   # Change current working directory | ||||||
|    >>> os.system('mkdir today')   # Run the command mkdir in the system shell |    >>> os.system('mkdir today')   # Run the command mkdir in the system shell | ||||||
|    0 |    0 | ||||||
|  |  | ||||||
|  | @ -277,7 +277,7 @@ applications include caching objects that are expensive to create:: | ||||||
|    Traceback (most recent call last): |    Traceback (most recent call last): | ||||||
|      File "<stdin>", line 1, in <module> |      File "<stdin>", line 1, in <module> | ||||||
|        d['primary']                # entry was automatically removed |        d['primary']                # entry was automatically removed | ||||||
|      File "C:/python34/lib/weakref.py", line 46, in __getitem__ |      File "C:/python35/lib/weakref.py", line 46, in __getitem__ | ||||||
|        o = self.data[key]() |        o = self.data[key]() | ||||||
|    KeyError: 'primary' |    KeyError: 'primary' | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -17,13 +17,13 @@ | ||||||
| /* Version parsed out into numeric values */ | /* Version parsed out into numeric values */ | ||||||
| /*--start constants--*/ | /*--start constants--*/ | ||||||
| #define PY_MAJOR_VERSION	3 | #define PY_MAJOR_VERSION	3 | ||||||
| #define PY_MINOR_VERSION	4 | #define PY_MINOR_VERSION	5 | ||||||
| #define PY_MICRO_VERSION	0 | #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 | #define PY_RELEASE_SERIAL	0 | ||||||
| 
 | 
 | ||||||
| /* Version as a string */ | /* Version as a string */ | ||||||
| #define PY_VERSION      	"3.4.0+" | #define PY_VERSION      	"3.5.0a0" | ||||||
| /*--end constants--*/ | /*--end constants--*/ | ||||||
| 
 | 
 | ||||||
| /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
 | /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
 | ||||||
|  |  | ||||||
|  | @ -13,5 +13,5 @@ | ||||||
| # Updated automatically by the Python release process. | # Updated automatically by the Python release process. | ||||||
| # | # | ||||||
| #--start constants-- | #--start constants-- | ||||||
| __version__ = "3.4.0rc1" | __version__ = "3.5.0a0" | ||||||
| #--end constants-- | #--end constants-- | ||||||
|  |  | ||||||
|  | @ -1 +1 @@ | ||||||
| IDLE_VERSION = "3.4.0rc1" | IDLE_VERSION = "3.5.0a0" | ||||||
|  |  | ||||||
							
								
								
									
										11
									
								
								Misc/NEWS
									
										
									
									
									
								
							
							
						
						
									
										11
									
								
								Misc/NEWS
									
										
									
									
									
								
							|  | @ -2,6 +2,17 @@ | ||||||
| Python News | Python News | ||||||
| +++++++++++ | +++++++++++ | ||||||
| 
 | 
 | ||||||
|  | What's New in Python 3.5 alpha 1? | ||||||
|  | ================================= | ||||||
|  | 
 | ||||||
|  | Release date: TBA | ||||||
|  | 
 | ||||||
|  | Core and Builtins | ||||||
|  | ----------------- | ||||||
|  | 
 | ||||||
|  | Library | ||||||
|  | ------- | ||||||
|  | 
 | ||||||
| What's New in Python 3.4.1rc1? | What's New in Python 3.4.1rc1? | ||||||
| ============================== | ============================== | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -39,8 +39,8 @@ | ||||||
| 
 | 
 | ||||||
| %define name python | %define name python | ||||||
| #--start constants-- | #--start constants-- | ||||||
| %define version 3.4.0rc1 | %define version 3.5.0a0 | ||||||
| %define libvers 3.4 | %define libvers 3.5 | ||||||
| #--end constants-- | #--end constants-- | ||||||
| %define release 1pydotorg | %define release 1pydotorg | ||||||
| %define __prefix /usr | %define __prefix /usr | ||||||
|  |  | ||||||
							
								
								
									
										16
									
								
								README
									
										
									
									
									
								
							
							
						
						
									
										16
									
								
								README
									
										
									
									
									
								
							|  | @ -1,5 +1,5 @@ | ||||||
| This is Python version 3.4.0 release candidate 1 | This is Python version 3.5.0 alpha 1 | ||||||
| ================================================ | ==================================== | ||||||
| 
 | 
 | ||||||
| Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, | Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, | ||||||
| 2012, 2013, 2014 Python Software Foundation.  All rights reserved. | 2012, 2013, 2014 Python Software Foundation.  All rights reserved. | ||||||
|  | @ -52,9 +52,9 @@ What's New | ||||||
| ---------- | ---------- | ||||||
| 
 | 
 | ||||||
| We try to have a comprehensive overview of the changes in the "What's New in | We try to have a comprehensive overview of the changes in the "What's New in | ||||||
| Python 3.4" document, found at | Python 3.5" document, found at | ||||||
| 
 | 
 | ||||||
|     http://docs.python.org/3.4/whatsnew/3.4.html |     http://docs.python.org/3.5/whatsnew/3.5.html | ||||||
| 
 | 
 | ||||||
| For a more detailed change log, read Misc/NEWS (though this file, too, is | For a more detailed change log, read Misc/NEWS (though this file, too, is | ||||||
| incomplete, and also doesn't list anything merged in from the 2.7 release under | incomplete, and also doesn't list anything merged in from the 2.7 release under | ||||||
|  | @ -67,9 +67,9 @@ entitled "Installing multiple versions". | ||||||
| Documentation | Documentation | ||||||
| ------------- | ------------- | ||||||
| 
 | 
 | ||||||
| Documentation for Python 3.4 is online, updated daily: | Documentation for Python 3.5 is online, updated daily: | ||||||
| 
 | 
 | ||||||
|     http://docs.python.org/3.4/ |     http://docs.python.org/3.5/ | ||||||
| 
 | 
 | ||||||
| It can also be downloaded in many formats for faster access.  The documentation | It can also be downloaded in many formats for faster access.  The documentation | ||||||
| is downloadable in HTML, PDF, and reStructuredText formats; the latter version | is downloadable in HTML, PDF, and reStructuredText formats; the latter version | ||||||
|  | @ -94,7 +94,7 @@ backported versions of certain key Python 3.x features. | ||||||
| A source-to-source translation tool, "2to3", can take care of the mundane task | A source-to-source translation tool, "2to3", can take care of the mundane task | ||||||
| of converting large amounts of source code.  It is not a complete solution but | of converting large amounts of source code.  It is not a complete solution but | ||||||
| is complemented by the deprecation warnings in 2.6.  See | is complemented by the deprecation warnings in 2.6.  See | ||||||
| http://docs.python.org/3.4/library/2to3.html for more information. | http://docs.python.org/3.5/library/2to3.html for more information. | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| Testing | Testing | ||||||
|  | @ -132,7 +132,7 @@ same prefix you must decide which version (if any) is your "primary" version. | ||||||
| Install that version using "make install".  Install all other versions using | Install that version using "make install".  Install all other versions using | ||||||
| "make altinstall". | "make altinstall". | ||||||
| 
 | 
 | ||||||
| For example, if you want to install Python 2.6, 2.7 and 3.4 with 2.7 being the | For example, if you want to install Python 2.6, 2.7 and 3.5 with 2.7 being the | ||||||
| primary version, you would execute "make install" in your 2.7 build directory | primary version, you would execute "make install" in your 2.7 build directory | ||||||
| and "make altinstall" in the others. | and "make altinstall" in the others. | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
							
								
								
									
										20
									
								
								configure
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										20
									
								
								configure
									
										
									
									
										vendored
									
									
								
							|  | @ -1,6 +1,6 @@ | ||||||
| #! /bin/sh | #! /bin/sh | ||||||
| # Guess values for system-dependent variables and create Makefiles. | # Guess values for system-dependent variables and create Makefiles. | ||||||
| # Generated by GNU Autoconf 2.69 for python 3.4. | # Generated by GNU Autoconf 2.69 for python 3.5. | ||||||
| # | # | ||||||
| # Report bugs to <http://bugs.python.org/>. | # Report bugs to <http://bugs.python.org/>. | ||||||
| # | # | ||||||
|  | @ -580,8 +580,8 @@ MAKEFLAGS= | ||||||
| # Identity of this package. | # Identity of this package. | ||||||
| PACKAGE_NAME='python' | PACKAGE_NAME='python' | ||||||
| PACKAGE_TARNAME='python' | PACKAGE_TARNAME='python' | ||||||
| PACKAGE_VERSION='3.4' | PACKAGE_VERSION='3.5' | ||||||
| PACKAGE_STRING='python 3.4' | PACKAGE_STRING='python 3.5' | ||||||
| PACKAGE_BUGREPORT='http://bugs.python.org/' | PACKAGE_BUGREPORT='http://bugs.python.org/' | ||||||
| PACKAGE_URL='' | PACKAGE_URL='' | ||||||
| 
 | 
 | ||||||
|  | @ -1368,7 +1368,7 @@ if test "$ac_init_help" = "long"; then | ||||||
|   # Omit some internal or obsolete options to make the list less imposing. |   # 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. |   # This message is too long to be a string in the A/UX 3.1 sh. | ||||||
|   cat <<_ACEOF |   cat <<_ACEOF | ||||||
| \`configure' configures python 3.4 to adapt to many kinds of systems. | \`configure' configures python 3.5 to adapt to many kinds of systems. | ||||||
| 
 | 
 | ||||||
| Usage: $0 [OPTION]... [VAR=VALUE]... | Usage: $0 [OPTION]... [VAR=VALUE]... | ||||||
| 
 | 
 | ||||||
|  | @ -1433,7 +1433,7 @@ fi | ||||||
| 
 | 
 | ||||||
| if test -n "$ac_init_help"; then | if test -n "$ac_init_help"; then | ||||||
|   case $ac_init_help in |   case $ac_init_help in | ||||||
|      short | recursive ) echo "Configuration of python 3.4:";; |      short | recursive ) echo "Configuration of python 3.5:";; | ||||||
|    esac |    esac | ||||||
|   cat <<\_ACEOF |   cat <<\_ACEOF | ||||||
| 
 | 
 | ||||||
|  | @ -1580,7 +1580,7 @@ fi | ||||||
| test -n "$ac_init_help" && exit $ac_status | test -n "$ac_init_help" && exit $ac_status | ||||||
| if $ac_init_version; then | if $ac_init_version; then | ||||||
|   cat <<\_ACEOF |   cat <<\_ACEOF | ||||||
| python configure 3.4 | python configure 3.5 | ||||||
| generated by GNU Autoconf 2.69 | generated by GNU Autoconf 2.69 | ||||||
| 
 | 
 | ||||||
| Copyright (C) 2012 Free Software Foundation, Inc. | Copyright (C) 2012 Free Software Foundation, Inc. | ||||||
|  | @ -2419,7 +2419,7 @@ cat >config.log <<_ACEOF | ||||||
| This file contains any messages produced by compilers while | This file contains any messages produced by compilers while | ||||||
| running configure, to aid debugging if configure makes a mistake. | running configure, to aid debugging if configure makes a mistake. | ||||||
| 
 | 
 | ||||||
| It was created by python $as_me 3.4, which was | It was created by python $as_me 3.5, which was | ||||||
| generated by GNU Autoconf 2.69.  Invocation command line was | generated by GNU Autoconf 2.69.  Invocation command line was | ||||||
| 
 | 
 | ||||||
|   $ $0 $@ |   $ $0 $@ | ||||||
|  | @ -2989,7 +2989,7 @@ rm confdefs.h | ||||||
| mv confdefs.h.new confdefs.h | mv confdefs.h.new confdefs.h | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| VERSION=3.4 | VERSION=3.5 | ||||||
| 
 | 
 | ||||||
| # Version number of Python's own shared library file. | # Version number of Python's own shared library file. | ||||||
| 
 | 
 | ||||||
|  | @ -15900,7 +15900,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | ||||||
| # report actual input values of CONFIG_FILES etc. instead of their | # report actual input values of CONFIG_FILES etc. instead of their | ||||||
| # values after options handling. | # values after options handling. | ||||||
| ac_log=" | ac_log=" | ||||||
| This file was extended by python $as_me 3.4, which was | This file was extended by python $as_me 3.5, which was | ||||||
| generated by GNU Autoconf 2.69.  Invocation command line was | generated by GNU Autoconf 2.69.  Invocation command line was | ||||||
| 
 | 
 | ||||||
|   CONFIG_FILES    = $CONFIG_FILES |   CONFIG_FILES    = $CONFIG_FILES | ||||||
|  | @ -15962,7 +15962,7 @@ _ACEOF | ||||||
| cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | ||||||
| ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | ||||||
| ac_cs_version="\\ | ac_cs_version="\\ | ||||||
| python config.status 3.4 | python config.status 3.5 | ||||||
| configured by $0, generated by GNU Autoconf 2.69, | configured by $0, generated by GNU Autoconf 2.69, | ||||||
|   with options \\"\$ac_cs_config\\" |   with options \\"\$ac_cs_config\\" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -3,7 +3,7 @@ dnl * Please run autoreconf to test your changes! * | ||||||
| dnl *********************************************** | dnl *********************************************** | ||||||
| 
 | 
 | ||||||
| # Set VERSION so we only need to edit in one place (i.e., here) | # Set VERSION so we only need to edit in one place (i.e., here) | ||||||
| m4_define(PYTHON_VERSION, 3.4) | m4_define(PYTHON_VERSION, 3.5) | ||||||
| 
 | 
 | ||||||
| AC_PREREQ(2.65) | AC_PREREQ(2.65) | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Larry Hastings
						Larry Hastings