diff options
| author | Larry Hastings <larry@hastings.org> | 2017-01-03 02:32:30 (GMT) |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2017-01-03 02:32:30 (GMT) |
| commit | 31f9d9d340a78c606927ecb33420c4d8299954ec (patch) | |
| tree | 39bf67dddd21ec687dd5c8a0e851752960e41560 | |
| parent | e744804bc9c91aadbdd37defc70a24617ca1fb72 (diff) | |
| parent | 225b01b840939499089d3c3a4abaf15afde85679 (diff) | |
| download | cpython-31f9d9d340a78c606927ecb33420c4d8299954ec.zip cpython-31f9d9d340a78c606927ecb33420c4d8299954ec.tar.gz cpython-31f9d9d340a78c606927ecb33420c4d8299954ec.tar.bz2 | |
Merge Python 3.5.3rc1 release changes back into the main branch.
| -rw-r--r-- | Doc/reference/datamodel.rst | 6 | ||||
| -rw-r--r-- | Lib/inspect.py | 1 | ||||
| -rw-r--r-- | 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 index 2f5625b..cd28c14 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -765,9 +765,9 @@ Custom classes 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 index 6b9e0b0..9f9fcfe 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -1416,7 +1416,6 @@ def getframeinfo(frame, context=1): 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 index f7c3b35..5507687 100644 --- 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> |