diff options
| -rw-r--r-- | Lib/dbm/__init__.py | 6 | ||||
| -rw-r--r-- | Lib/test/test_dbm.py | 8 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
4 files changed, 16 insertions, 3 deletions
diff --git a/Lib/dbm/__init__.py b/Lib/dbm/__init__.py index c224847597..99c16379a9 100644 --- a/Lib/dbm/__init__.py +++ b/Lib/dbm/__init__.py @@ -68,10 +68,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 diff --git a/Lib/test/test_dbm.py b/Lib/test/test_dbm.py index 818be453f4..ce48cfd5ce 100644 --- a/Lib/test/test_dbm.py +++ b/Lib/test/test_dbm.py @@ -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') @@ -154,6 +154,7 @@ Terrence Cole Benjamin Collar Jeffery Collins Paul Colomiets +Denver Coneybeare Matt Conway David M. Cooke Greg Copeland @@ -40,6 +40,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 #11131: Fix sign of zero in decimal.Decimal plus and minus operations when the rounding mode is ROUND_FLOOR. |