[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #15812: Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/7cbcee0c53e3
changeset:   105970:7cbcee0c53e3
branch:      3.6
parent:      105966:7ef5b02b228a
parent:      105969:2b6bdd6cd3f8
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Tue Jan 03 03:48:34 2017 +0300
summary:
  Issue #15812: Merge from 3.5

files:
  Lib/inspect.py |  1 -
  1 files changed, 0 insertions(+), 1 deletions(-)


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

-- 
Repository URL: https://hg.python.org/cpython