[Python-checkins] cpython (merge 3.5 -> 3.5): Merge Python 3.5.3rc1 release changes back into the main branch.
larry.hastings
python-checkins at python.org
Mon Jan 2 21:40:43 EST 2017
https://hg.python.org/cpython/rev/b2c4ac501fb2
changeset: 105978:b2c4ac501fb2
branch: 3.5
parent: 105977:be39e5159a01
parent: 105969:2b6bdd6cd3f8
user: Larry Hastings <larry at hastings.org>
date: Mon Jan 02 18:32:30 2017 -0800
summary:
Merge Python 3.5.3rc1 release changes back into the main branch.
files:
Doc/reference/datamodel.rst | 6 +++---
Lib/inspect.py | 1 -
Mac/IDLE/IDLE.app/Contents/Info.plist | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -765,9 +765,9 @@
Special attributes: :attr:`~definition.__name__` is the class name; :attr:`__module__` is
the module name in which the class was defined; :attr:`~object.__dict__` is the
dictionary containing the class's namespace; :attr:`~class.__bases__` is a
- tuple (possibly a singleton) containing the base classes, in the
- order of their occurrence in the base class list; :attr:`__doc__` is the
- class's documentation string, or ``None`` if undefined.
+ tuple containing the base classes, in the order of their occurrence in the
+ base class list; :attr:`__doc__` is the class's documentation string, or
+ ``None`` if undefined.
Class instances
.. index::
diff --git a/Lib/inspect.py b/Lib/inspect.py
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -1416,7 +1416,6 @@
except OSError:
lines = index = None
else:
- start = max(start, 0)
start = max(0, min(start, len(lines) - context))
lines = lines[start:start+context]
index = lineno - 1 - start
diff --git a/Mac/IDLE/IDLE.app/Contents/Info.plist b/Mac/IDLE/IDLE.app/Contents/Info.plist
--- a/Mac/IDLE/IDLE.app/Contents/Info.plist
+++ b/Mac/IDLE/IDLE.app/Contents/Info.plist
@@ -36,7 +36,7 @@
<key>CFBundleExecutable</key>
<string>IDLE</string>
<key>CFBundleGetInfoString</key>
- <string>%version%, © 2001-2016 Python Software Foundation</string>
+ <string>%version%, © 2001-2017 Python Software Foundation</string>
<key>CFBundleIconFile</key>
<string>IDLE.icns</string>
<key>CFBundleIdentifier</key>
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list