merge 3.2 (#14612)

diff --cc Lib/test/test_sys_settrace.py
index 578e95d627aa241dfe88e57bbdd653d928196bd8,ea2bb2987afb3227ac4327fd184323a2b2f0f999..fdf958ce24f9e8433117371a7310b7c1729821b7
--- 1/Lib/test/test_sys_settrace.py
--- 2/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@@ -747,9 -747,10 +755,12 @@@ class JumpTestCase(unittest.TestCase)
      def test_18_no_jump_to_non_integers(self):
          self.run_test(no_jump_to_non_integers)
      def test_19_no_jump_without_trace_function(self):
 +        # Must set sys.settrace(None) in setUp(), else condition is not
 +        # triggered.
          no_jump_without_trace_function()
+     def test_jump_across_with(self):
+         self.addCleanup(support.unlink, support.TESTFN)
+         self.run_test(jump_across_with)
  
      def test_20_large_function(self):
          d = {}

diff --cc Misc/NEWS
index 641da18fd5397ca3e7c311cf8732b4879354f103,43f08c93ecb13204743c96ecc3baadf0214fd324..0e55a24a5fea406110cdff22d8848c603ad35798
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,19 -10,10 +10,21 @@@ What's New in Python 3.3.0 Alpha 3
  Core and Builtins
  -----------------
  
 +- Issue #12599: Be more strict in accepting None compared to a false-like
 +  object for importlib.util.module_for_loader and
 +  importlib.machinery.PathFinder.
 +
+ - Issue #14612: Fix jumping around with blocks by setting f_lineno.
+ 
 +- Issue #14592: Attempting a relative import w/o __package__ or __name__ set in
 +  globals raises a KeyError.
 +
  - Issue #14607: Fix defaults keyword-only arguments which started with ``__``.
  
 +- Issue #10854: The ImportError raised when an extension module on Windows
 +  fails to import now uses the new path and name attributes from
 +  Issue #1559549.
 +
  - Issue #13889: Check and (if necessary) set FPU control word before calling
    any of the dtoa.c string <-> float conversion functions, on MSVC builds of
    Python.  This fixes issues when embedding Python in a Delphi app.

diff --cc Objects/frameobject.c
Simple merge