merge from 3.4

diff --cc Lib/pdb.py
Simple merge

diff --cc Misc/NEWS
index 26a4480fffbe762f75eeca7b26bc125948700ce8,dd175fead46e030d58893938c2bb7a1795a7d149..5f23605b23be53d41172266007a111e25bcd9698
--- 1/Misc/NEWS
--- 2/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