mirror of https://github.com/python/cpython
#3929: dbm.open() would try to raise a tuple. This does not work anymore with python 3.0.
Reviewed by Georg Brandl.
This commit is contained in:
parent
7de5f29972
commit
b5cf301b8e
|
@ -76,13 +76,13 @@ def open(file, flag = 'r', mode = 0o666):
|
|||
# file doesn't exist and the new flag was used so use default type
|
||||
mod = _defaultmod
|
||||
else:
|
||||
raise error("need 'c' or 'n' flag to open new db")
|
||||
raise error[0]("need 'c' or 'n' flag to open new db")
|
||||
elif result == "":
|
||||
# db type cannot be determined
|
||||
raise error("db type could not be determined")
|
||||
raise error[0]("db type could not be determined")
|
||||
elif result not in _modules:
|
||||
raise error("db type is {0}, but the module is not "
|
||||
"available".format(result))
|
||||
raise error[0]("db type is {0}, but the module is not "
|
||||
"available".format(result))
|
||||
else:
|
||||
mod = _modules[result]
|
||||
return mod.open(file, flag, mode)
|
||||
|
|
|
@ -57,6 +57,9 @@ class AnyDBMTestCase(unittest.TestCase):
|
|||
def test_error(self):
|
||||
self.assert_(issubclass(self.module.error, IOError))
|
||||
|
||||
def test_anydbm_not_existing(self):
|
||||
self.assertRaises(dbm.error, dbm.open, _fname)
|
||||
|
||||
def test_anydbm_creation(self):
|
||||
f = dbm.open(_fname, 'c')
|
||||
self.assertEqual(list(f.keys()), [])
|
||||
|
|
|
@ -20,6 +20,10 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #3929: When the database cannot be opened, dbm.open() would incorrectly
|
||||
raise a TypeError: "'tuple' object is not callable" instead of the expected
|
||||
dbm.error.
|
||||
|
||||
- Bug #3884: Make the turtle module toplevel again.
|
||||
|
||||
- Issue #3547: Fixed ctypes structures bitfields of varying integer
|
||||
|
|
Loading…
Reference in New Issue