mirror of https://github.com/python/cpython
Fix #11491. When dbm.open was called with a file which already exists and
the "flag" argument is "n", dbm.error was being raised. As documented, dbm.open(...,flag='n') will now "Always create a new, empty database, open for reading and writing", regardless of a previous file existing.
This commit is contained in:
commit
30bb6e0360
|
@ -67,10 +67,10 @@ def open(file, flag = 'r', mode = 0o666):
|
|||
if not _defaultmod:
|
||||
raise ImportError("no dbm clone found; tried %s" % _names)
|
||||
|
||||
# guess the type of an existing database
|
||||
result = whichdb(file)
|
||||
# guess the type of an existing database, if not creating a new one
|
||||
result = whichdb(file) if 'n' not in flag else None
|
||||
if result is None:
|
||||
# db doesn't exist
|
||||
# db doesn't exist or 'n' flag was specified to create a new db
|
||||
if 'c' in flag or 'n' in flag:
|
||||
# file doesn't exist and the new flag was used so use default type
|
||||
mod = _defaultmod
|
||||
|
|
|
@ -70,6 +70,14 @@ class AnyDBMTestCase(unittest.TestCase):
|
|||
self.read_helper(f)
|
||||
f.close()
|
||||
|
||||
def test_anydbm_creation_n_file_exists_with_invalid_contents(self):
|
||||
with open(_fname, "w") as w:
|
||||
pass # create an empty file
|
||||
|
||||
f = dbm.open(_fname, 'n')
|
||||
self.addCleanup(f.close)
|
||||
self.assertEqual(len(f), 0)
|
||||
|
||||
def test_anydbm_modification(self):
|
||||
self.init_db()
|
||||
f = dbm.open(_fname, 'c')
|
||||
|
|
|
@ -171,6 +171,7 @@ Benjamin Collar
|
|||
Jeffery Collins
|
||||
Robert Collins
|
||||
Paul Colomiets
|
||||
Denver Coneybeare
|
||||
Geremy Condra
|
||||
Juan José Conti
|
||||
Matt Conway
|
||||
|
|
|
@ -68,6 +68,10 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #11491: dbm.error is no longer raised when dbm.open is called with
|
||||
the "n" as the flag argument and the file exists. The behavior matches
|
||||
the documentation and general logic.
|
||||
|
||||
- Issue #1162477: Postel Principal adjustment to email date parsing: handle the
|
||||
fact that some non-compliant MUAs use '.' instead of ':' in time specs.
|
||||
|
||||
|
|
Loading…
Reference in New Issue