diff options
| author | Petri Lehtinen <petri@digip.org> | 2012-02-17 19:36:52 (GMT) |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2012-02-17 19:36:52 (GMT) |
| commit | aa2c670ee66988ef14e5b74b1247e1ccfe8c320d (patch) | |
| tree | 0adecd79a445d2097859888014cc71706c0017aa | |
| parent | a9bf2ac7265c143eb11538a0ecd491d96edbf4da (diff) | |
| parent | c86d9e2846e5bcf7f047f96e5c95432ecfa4bcb7 (diff) | |
| download | cpython-aa2c670ee66988ef14e5b74b1247e1ccfe8c320d.zip cpython-aa2c670ee66988ef14e5b74b1247e1ccfe8c320d.tar.gz cpython-aa2c670ee66988ef14e5b74b1247e1ccfe8c320d.tar.bz2 | |
Merge branch '3.2'
Closes #11689.
| -rw-r--r-- | Lib/sqlite3/test/hooks.py | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Lib/sqlite3/test/hooks.py b/Lib/sqlite3/test/hooks.py index 97abe5f..3dc44f6 100644 --- a/Lib/sqlite3/test/hooks.py +++ b/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) @@ -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. |