diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/dbm/__init__.py | 5 | ||||
| -rw-r--r-- | Lib/test/test_dbm.py | 18 |
2 files changed, 21 insertions, 2 deletions
diff --git a/Lib/dbm/__init__.py b/Lib/dbm/__init__.py index 813a29d..a783fde 100644 --- a/Lib/dbm/__init__.py +++ b/Lib/dbm/__init__.py @@ -44,6 +44,11 @@ _modules = {} error = (error, IOError) +try: + from dbm import ndbm +except ImportError: + ndbm = None + def open(file, flag='r', mode=0o666): """Open or create database at path given by *file*. diff --git a/Lib/test/test_dbm.py b/Lib/test/test_dbm.py index 752e0b7..243a0af 100644 --- a/Lib/test/test_dbm.py +++ b/Lib/test/test_dbm.py @@ -9,6 +9,11 @@ import test.support # Skip tests if dbm module doesn't exist. dbm = test.support.import_module('dbm') +try: + from dbm import ndbm +except ImportError: + ndbm = None + _fname = test.support.TESTFN # @@ -130,7 +135,7 @@ class WhichDBTestCase(unittest.TestCase): delete_files() f = module.open(_fname, 'c') f.close() - self.assertEqual(name, dbm.whichdb(_fname)) + self.assertEqual(name, self.dbm.whichdb(_fname)) # Now add a key f = module.open(_fname, 'w') f[b"1"] = b"1" @@ -139,7 +144,15 @@ class WhichDBTestCase(unittest.TestCase): # and read it self.assertTrue(f[b"1"] == b"1") f.close() - self.assertEqual(name, dbm.whichdb(_fname)) + self.assertEqual(name, self.dbm.whichdb(_fname)) + + @unittest.skipUnless(ndbm, reason='Test requires ndbm') + def test_whichdb_ndbm(self): + # Issue 17198: check that ndbm which is referenced in whichdb is defined + db_file = '{}_ndbm.db'.format(_fname) + with open(db_file, 'w'): + self.addCleanup(test.support.unlink, db_file) + self.assertIsNone(self.dbm.whichdb(db_file[:-3])) def tearDown(self): delete_files() @@ -149,6 +162,7 @@ class WhichDBTestCase(unittest.TestCase): self.filename = test.support.TESTFN self.d = dbm.open(self.filename, 'c') self.d.close() + self.dbm = test.support.import_fresh_module('dbm') def test_keys(self): self.d = dbm.open(self.filename, 'c') |