From: Berker Peksag <berker.peksag@gmail.com>
Date: Mon, 2 Jan 2017 04:00:29 +0000 (+0300)
Subject: Issue #15812: Merge from 3.6
X-Git-Tag: v3.7.0a1~1643^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6215e524a2453c4c4d4e452ba90e8f37de5df5db;p=python

Issue #15812: Merge from 3.6
---

6215e524a2453c4c4d4e452ba90e8f37de5df5db
diff --cc Misc/NEWS
index 6152a3fc65,c8eacf1ce3..3d4a1861bd
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -208,9 -40,9 +208,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #15812: inspect.getframeinfo() now correctly shows the first line of
+   a context.  Patch by Sam Breese.
+ 
 +- Issue #28985: Update authorizer constants in sqlite3 module.
 +  Patch by Dingyuan Wang.
 +
  - Issue #29094: Offsets in a ZIP file created with extern file object and modes
    "w" and "x" now are relative to the start of the file.