summaryrefslogtreecommitdiffstats
path: root/Lib/inspect.py
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2017-01-03 02:32:30 (GMT)
committerLarry Hastings <larry@hastings.org>2017-01-03 02:32:30 (GMT)
commit31f9d9d340a78c606927ecb33420c4d8299954ec (patch)
tree39bf67dddd21ec687dd5c8a0e851752960e41560 /Lib/inspect.py
parente744804bc9c91aadbdd37defc70a24617ca1fb72 (diff)
parent225b01b840939499089d3c3a4abaf15afde85679 (diff)
downloadcpython-31f9d9d340a78c606927ecb33420c4d8299954ec.zip
cpython-31f9d9d340a78c606927ecb33420c4d8299954ec.tar.gz
cpython-31f9d9d340a78c606927ecb33420c4d8299954ec.tar.bz2
Merge Python 3.5.3rc1 release changes back into the main branch.
Diffstat (limited to 'Lib/inspect.py')
-rw-r--r--Lib/inspect.py1
1 files changed, 0 insertions, 1 deletions
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