Changeset 391 for python/trunk/Lib/test/test_whichdb.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_whichdb.py (modified) (2 diffs)

python/trunk/Lib/test/test_whichdb.py

@@ -8 +8 @@
 import unittest
 import whichdb
-import anydbm
 import glob
 
 _fname = test.test_support.TESTFN
+
+# Silence Py3k warning
+anydbm = test.test_support.import_module('anydbm', deprecated=True)
 
 def _delete_files():
@@ -38 +40 @@
     # candidate database module.
     try:
-        mod = __import__(name)
-    except ImportError:
+        # Silence Py3k warning
+        mod = test.test_support.import_module(name, deprecated=True)
+    except unittest.SkipTest:
         continue