From c276ffa0a9dc195c617e7a53497e2e80e21bab30 Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@python.org>
Date: Mon, 2 Jan 2017 02:46:09 -0500
Subject: ring IDLE.app into 2017, too

---
 Mac/IDLE/IDLE.app/Contents/Info.plist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mac/IDLE/IDLE.app/Contents/Info.plist b/Mac/IDLE/IDLE.app/Contents/Info.plist
index d0257ba..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-2014 Python Software Foundation</string>
+	<string>%version%, © 2001-2017 Python Software Foundation</string>
 	<key>CFBundleIconFile</key>
 	<string>IDLE.icns</string>
 	<key>CFBundleIdentifier</key>
-- 
cgit v0.12


From 7b4e55109100d1069e8176d6a84c48ec928f72ad Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Tue, 3 Jan 2017 03:34:15 +0300
Subject: Issue #29012: Remove another outdated information

Patch by Jim Fasarakis-Hilliard.
---
 Doc/reference/datamodel.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 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::
-- 
cgit v0.12


From 225b01b840939499089d3c3a4abaf15afde85679 Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Tue, 3 Jan 2017 03:48:04 +0300
Subject: Issue #15812: Delete redundant max(start, 0)

Noticed by Serhiy Storchaka.
---
 Lib/inspect.py | 1 -
 1 file changed, 1 deletion(-)

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
-- 
cgit v0.12