From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 5 Sep 2015 23:17:24 +0000 (-0400)
Subject: merge from 3.4
X-Git-Tag: v3.6.0a1~1663^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e989bf587cd0e239de23846a22618613472a71ff;p=python

merge from 3.4
---

e989bf587cd0e239de23846a22618613472a71ff
diff --cc Misc/NEWS
index 26a4480fff,dd175fead4..5f23605b23
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -11,9 -10,6 +11,12 @@@ Release date: TB
  Core and Builtins
  -----------------
  
 +Library
 +-------
 +
++- Issue #16180: Exit pdb if file has syntax error, instead of trapping user
++  in an infinite loop.  Patch by Xavier de Gaye.
++
  - Issue #24891: Fix a race condition at Python startup if the file descriptor
    of stdin (0), stdout (1) or stderr (2) is closed while Python is creating
    sys.stdin, sys.stdout and sys.stderr objects. These attributes are now set