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.

diff --git a/Lib/dbm/__init__.py b/Lib/dbm/__init__.py
index b2a254a2b69472d96e4c8c77b1726fa59ee18b0c..6e890f36aac2ee15c07fec259608c26f214d025e 100644 (file)
--- a/Lib/dbm/__init__.py
+++ b/Lib/dbm/__init__.py
@@ -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

diff --git a/Lib/test/test_dbm.py b/Lib/test/test_dbm.py
index 74c9c44b23044413c60da8d4d4483ecc6b4197ab..26d4c146238a8ab25146c753664f5d2bf93313cb 100644 (file)
--- 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')

diff --git a/Misc/ACKS b/Misc/ACKS
index d507ade49f7b0a090fa1895df42c5e8897a0924e..a11bcf0a6d4eca7c402591be1489c3c93a29837e 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -169,6 +169,7 @@ Benjamin Collar
 Jeffery Collins
 Robert Collins
 Paul Colomiets
+Denver Coneybeare
 Geremy Condra
 Juan José Conti
 Matt Conway

diff --git a/Misc/NEWS b/Misc/NEWS
index bcda5300583101916f4fa47cced2c25f7f83b15f..f3442a52bbbb44e5f5ab3ce81c00c79077ff6003 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -34,6 +34,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.