From: R. David Murray <rdmurray@bitdance.com>
Date: Sat, 2 Oct 2010 13:29:13 +0000 (+0000)
Subject: Make the printing of sqlite version in verbose mode work with regrtest -w.
X-Git-Tag: v3.2a3~70
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f7bcb3f8557ebae74a710610aeb4db63421e496;p=thirdparty%2FPython%2Fcpython.git

Make the printing of sqlite version in verbose mode work with regrtest -w.
---

diff --git a/Lib/test/test_sqlite.py b/Lib/test/test_sqlite.py
index 8f8cd8750ba8..1086330ab09e 100644
--- a/Lib/test/test_sqlite.py
+++ b/Lib/test/test_sqlite.py
@@ -1,7 +1,7 @@
-from test.support import run_unittest, import_module, verbose
+import test.support
 
 # Skip test if _sqlite3 module not installed
-import_module('_sqlite3')
+test.support.import_module('_sqlite3')
 
 import sqlite3
 from sqlite3.test import (dbapi, types, userfunctions,
@@ -9,13 +9,15 @@ from sqlite3.test import (dbapi, types, userfunctions,
                                 dump)
 
 def test_main():
-    if verbose:
+    if test.support.verbose:
         print("test_sqlite: testing with version",
               "{!r}, sqlite_version {!r}".format(sqlite3.version,
                                                  sqlite3.sqlite_version))
-    run_unittest(dbapi.suite(), types.suite(), userfunctions.suite(),
-                 factory.suite(), transactions.suite(),
-                 hooks.suite(), regression.suite(), dump.suite())
+    test.support.run_unittest(dbapi.suite(), types.suite(),
+                               userfunctions.suite(),
+                               factory.suite(), transactions.suite(),
+                               hooks.suite(), regression.suite(),
+                               dump.suite())
 
 if __name__ == "__main__":
     test_main()