Skip to content

Commit ffb40e5

Browse files
committed
More version bumping to 3.6.
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.)
1 parent a8c22a0 commit ffb40e5

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

Doc/tutorial/interpreter.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. _tut-using:
1+
3.6.. _tut-using:
22

33
****************************
44
Using the Python Interpreter
@@ -10,25 +10,25 @@ Using the Python Interpreter
1010
Invoking the Interpreter
1111
========================
1212

13-
The Python interpreter is usually installed as :file:`/usr/local/bin/python3.5`
13+
The Python interpreter is usually installed as :file:`/usr/local/bin/python3.6`
1414
on those machines where it is available; putting :file:`/usr/local/bin` in your
1515
Unix shell's search path makes it possible to start it by typing the command:
1616

1717
.. code-block:: text
1818
19-
python3.5
19+
python3.6
2020
2121
to the shell. [#]_ Since the choice of the directory where the interpreter lives
2222
is an installation option, other places are possible; check with your local
2323
Python guru or system administrator. (E.g., :file:`/usr/local/python` is a
2424
popular alternative location.)
2525

2626
On Windows machines, the Python installation is usually placed in
27-
:file:`C:\\Python35`, though you can change this when you're running the
27+
:file:`C:\\Python36`, though you can change this when you're running the
2828
installer. To add this directory to your path, you can type the following
2929
command into the command prompt in a DOS box::
3030

31-
set path=%path%;C:\python35
31+
set path=%path%;C:\python36
3232

3333
Typing an end-of-file character (:kbd:`Control-D` on Unix, :kbd:`Control-Z` on
3434
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
9696
prints a welcome message stating its version number and a copyright notice
9797
before printing the first prompt::
9898

99-
$ python3.5
100-
Python 3.5 (default, Sep 16 2015, 09:25:04)
99+
$ python3.6
100+
Python 3.6 (default, Sep 16 2015, 09:25:04)
101101
[GCC 4.8.2] on linux
102102
Type "help", "copyright", "credits" or "license" for more information.
103103
>>>

Doc/tutorial/stdlib.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ operating system::
1515

1616
>>> import os
1717
>>> os.getcwd() # Return the current working directory
18-
'C:\\Python35'
18+
'C:\\Python36'
1919
>>> os.chdir('/server/accesslogs') # Change current working directory
2020
>>> os.system('mkdir today') # Run the command mkdir in the system shell
2121
0

Doc/tutorial/stdlib2.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ applications include caching objects that are expensive to create::
277277
Traceback (most recent call last):
278278
File "<stdin>", line 1, in <module>
279279
d['primary'] # entry was automatically removed
280-
File "C:/python35/lib/weakref.py", line 46, in __getitem__
280+
File "C:/python36/lib/weakref.py", line 46, in __getitem__
281281
o = self.data[key]()
282282
KeyError: 'primary'
283283

README

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
This is Python version 3.5.0 beta 1
2-
===================================
1+
This is Python version 3.6.0 alpha 1
2+
====================================
33

44
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
55
2012, 2013, 2014, 2015 Python Software Foundation. All rights reserved.
@@ -50,9 +50,9 @@ What's New
5050
----------
5151

5252
We try to have a comprehensive overview of the changes in the "What's New in
53-
Python 3.5" document, found at
53+
Python 3.6" document, found at
5454

55-
http://docs.python.org/3.5/whatsnew/3.5.html
55+
http://docs.python.org/3.6/whatsnew/3.6.html
5656

5757
For a more detailed change log, read Misc/NEWS (though this file, too, is
5858
incomplete, and also doesn't list anything merged in from the 2.7 release under
@@ -65,9 +65,9 @@ entitled "Installing multiple versions".
6565
Documentation
6666
-------------
6767

68-
Documentation for Python 3.5 is online, updated daily:
68+
Documentation for Python 3.6 is online, updated daily:
6969

70-
http://docs.python.org/3.5/
70+
http://docs.python.org/3.6/
7171

7272
It can also be downloaded in many formats for faster access. The documentation
7373
is downloadable in HTML, PDF, and reStructuredText formats; the latter version
@@ -92,7 +92,7 @@ backported versions of certain key Python 3.x features.
9292
A source-to-source translation tool, "2to3", can take care of the mundane task
9393
of converting large amounts of source code. It is not a complete solution but
9494
is complemented by the deprecation warnings in 2.6. See
95-
http://docs.python.org/3.5/library/2to3.html for more information.
95+
http://docs.python.org/3.6/library/2to3.html for more information.
9696

9797

9898
Testing
@@ -130,7 +130,7 @@ same prefix you must decide which version (if any) is your "primary" version.
130130
Install that version using "make install". Install all other versions using
131131
"make altinstall".
132132

133-
For example, if you want to install Python 2.6, 2.7 and 3.5 with 2.7 being the
133+
For example, if you want to install Python 2.6, 2.7 and 3.6 with 2.7 being the
134134
primary version, you would execute "make install" in your 2.7 build directory
135135
and "make altinstall" in the others.
136136

0 commit comments

Comments
 (0)