[Python-checkins] cpython (merge 3.2 -> default): Merge branch '3.2'

[petri.lehtinen]

http://hg.python.org/cpython/rev/6b834e3c0882
changeset:   75008:6b834e3c0882
parent:      75005:06ed9b3f02af
parent:      75006:bf7226719aec
user:        Petri Lehtinen <petri at digip.org>
date:        Fri Feb 17 21:36:52 2012 +0200
summary:
  Merge branch '3.2'

Closes #11689.

files:
  Lib/sqlite3/test/hooks.py |  1 +
  Misc/NEWS                 |  2 ++
  2 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/Lib/sqlite3/test/hooks.py b/Lib/sqlite3/test/hooks.py
--- a/Lib/sqlite3/test/hooks.py
+++ b/Lib/sqlite3/test/hooks.py
@@ -168,6 +168,7 @@
         con = sqlite.connect(":memory:")
         action = 0
         def progress():
+            nonlocal action
             action = 1
             return 0
         con.set_progress_handler(progress, 1)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2042,6 +2042,8 @@
 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.

-- 
Repository URL: http://hg.python.org/cpython