mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-30 14:44:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

More version bumping to 3.6.

Browse source 
With the creation of the 3.5 branch earlier in the process,
it is necessary to do some of the version bumps now rather than at
final release time (for example, the equivalent of the 3.4->3.5 bumps
in f2bf12fa22c1).  (Some of those changes have already been made, for
example in 30f5e7ec6afe.)
This commit is contained in:
Ned Deily 2015-05-27 22:00:46 -07:00
parent a8c22a0c32
commit ffb40e5ec3
4 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Doc/tutorial/interpreter.rst
View file

@ -1,4 +1,4 @@
.. _tut-using: 3.6.. _tut-using:
**************************** ****************************
Using the Python Interpreter Using the Python Interpreter
@ -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.5` The Python interpreter is usually installed as :file:`/usr/local/bin/python3.6`
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.5 python3.6
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:\\Python35`, though you can change this when you're running the :file:`C:\\Python36`, 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:\python35 set path=%path%;C:\python36
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
@ -96,8 +96,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.5 $ python3.6
Python 3.5 (default, Sep 16 2015, 09:25:04) Python 3.6 (default, Sep 16 2015, 09:25:04)
[GCC 4.8.2] on linux [GCC 4.8.2] on linux
Type "help", "copyright", "credits" or "license" for more information. Type "help", "copyright", "credits" or "license" for more information.
>>> >>>

2
Doc/tutorial/stdlib.rst
View file

@ -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:\\Python35' 'C:\\Python36'
>>> 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

2
Doc/tutorial/stdlib2.rst
View file

@ -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:/python35/lib/weakref.py", line 46, in __getitem__ File "C:/python36/lib/weakref.py", line 46, in __getitem__
o = self.data[key]() o = self.data[key]()
KeyError: 'primary' KeyError: 'primary'

16
README
View file

@ -1,5 +1,5 @@
This is Python version 3.5.0 beta 1 This is Python version 3.6.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, 2015 Python Software Foundation. All rights reserved. 2012, 2013, 2014, 2015 Python Software Foundation. All rights reserved.
@ -50,9 +50,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.5" document, found at Python 3.6" document, found at
http://docs.python.org/3.5/whatsnew/3.5.html http://docs.python.org/3.6/whatsnew/3.6.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
@ -65,9 +65,9 @@ entitled "Installing multiple versions".
Documentation Documentation
------------- -------------
Documentation for Python 3.5 is online, updated daily: Documentation for Python 3.6 is online, updated daily:
http://docs.python.org/3.5/ http://docs.python.org/3.6/
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
@ -92,7 +92,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.5/library/2to3.html for more information. http://docs.python.org/3.6/library/2to3.html for more information.
Testing Testing
@ -130,7 +130,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.5 with 2.7 being the For example, if you want to install Python 2.6, 2.7 and 3.6 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.