Changeset 391 for python/trunk/Lib/test/test_sqlite.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_sqlite.py (modified) (1 diff)

python/trunk/Lib/test/test_sqlite.py

@@ -1 @@
-from test.test_support import run_unittest, TestSkipped
+from test.test_support import run_unittest, import_module
 
-try:
-    import _sqlite3
-except ImportError:
-    raise TestSkipped('no sqlite available')
+# Skip test if _sqlite3 module was not built.
+import_module('_sqlite3')
+
 from sqlite3.test import (dbapi, types, userfunctions, py25tests,
                                 factory, transactions, hooks, regression,