summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/sqlite3/test/hooks.py6
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
3 files changed, 7 insertions, 3 deletions
diff --git a/Lib/sqlite3/test/hooks.py b/Lib/sqlite3/test/hooks.py
index 2745c8b..b798e74 100644
--- a/Lib/sqlite3/test/hooks.py
+++ b/Lib/sqlite3/test/hooks.py
@@ -166,14 +166,14 @@ class ProgressTests(unittest.TestCase):
Test that setting the progress handler to None clears the previously set handler.
"""
con = sqlite.connect(":memory:")
- action = 0
+ action = []
def progress():
- action = 1
+ action.append(1)
return 0
con.set_progress_handler(progress, 1)
con.set_progress_handler(None, 1)
con.execute("select 1 union select 2 union select 3").fetchall()
- self.assertEqual(action, 0, "progress handler was not cleared")
+ self.assertEqual(len(action), 0, "progress handler was not cleared")
def suite():
collation_suite = unittest.makeSuite(CollationTests, "Check")
diff --git a/Misc/ACKS b/Misc/ACKS
index caa4c5b..57de3d1 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -475,6 +475,7 @@ Vladimir Kushnir
Kirill Kuzminykh (Кирилл Кузьминых)
Ross Lagerwall
Cameron Laird
+Torsten Landschoff
Łukasz Langa
Tino Lange
Andrew Langmead
diff --git a/Misc/NEWS b/Misc/NEWS
index 1b1d02c..95e4b86 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -526,6 +526,9 @@ Tools/Demos
Tests
-----
+- Issue #11689: Fix a variable scoping error in an sqlite3 test.
+ Initial patch by Torsten Landschoff.
+
- Issue #13304: Skip test case if user site-packages disabled (-s or
PYTHONNOUSERSITE). (Patch by Carl Meyer)