traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge Python 3.5.3rc1 release changes back into the main branch.

This commit is contained in:
Larry Hastings 2017-01-02 18:32:30 -08:00
parent e744804bc9 225b01b840
commit 31f9d9d340
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Doc/reference/datamodel.rst
View File

@ -765,9 +765,9 @@ Custom classes
Special attributes: :attr:`~definition.__name__` is the class name; :attr:`__module__` is 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 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 dictionary containing the class's namespace; :attr:`~class.__bases__` is a
tuple (possibly a singleton) containing the base classes, in the tuple containing the base classes, in the order of their occurrence in the
order of their occurrence in the base class list; :attr:`__doc__` is the base class list; :attr:`__doc__` is the class's documentation string, or
class's documentation string, or ``None`` if undefined. ``None`` if undefined.
Class instances Class instances
.. index:: .. index::

1
Lib/inspect.py
View File

@ -1416,7 +1416,6 @@ def getframeinfo(frame, context=1):
except OSError: except OSError:
lines = index = None lines = index = None
else: else:
start = max(start, 0)
start = max(0, min(start, len(lines) - context)) start = max(0, min(start, len(lines) - context))
lines = lines[start:start+context] lines = lines[start:start+context]
index = lineno - 1 - start index = lineno - 1 - start

2
Mac/IDLE/IDLE.app/Contents/Info.plist
View File

@ -36,7 +36,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>IDLE</string> <string>IDLE</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>%version%, © 2001-2016 Python Software Foundation</string> <string>%version%, © 2001-2017 Python Software Foundation</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>IDLE.icns</string> <string>IDLE.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>