Merge branch '3.2'

Closes #11689.

Lib/sqlite3/test/hooks.py

@@ -168,6 +168,7 @@ class ProgressTests(unittest.TestCase):
         con = sqlite.connect(":memory:")
         action = 0
         def progress():
+            nonlocal action
             action = 1
             return 0
         con.set_progress_handler(progress, 1)

Misc/NEWS

@@ -2042,6 +2042,8 @@ Extension Modules
 Tests
 -----
 
+- Issue #11689: Fix a variable scoping error in an sqlite3 test
+
 - Issue #13786: Remove unimplemented 'trace' long option from regrtest.py.
 
 - Issue #13725: Fix regrtest to recognize the documented -d flag.