summaryrefslogtreecommitdiffstats
path: root/Lib/dbm
diff options
context:
space:
mode:
authorbriancurtin <brian.curtin@gmail.com>2011-03-14 19:35:35 (GMT)
committerbriancurtin <brian.curtin@gmail.com>2011-03-14 19:35:35 (GMT)
commit94eceeb89c153d8bf77dc194f8896a66cc25519a (patch)
treeaf14d0e536dbb4b85a5dcb7a3552b1b0146450a6 /Lib/dbm
parent250324952e63a51fe885d457d207082f249bbefd (diff)
downloadcpython-94eceeb89c153d8bf77dc194f8896a66cc25519a.zip
cpython-94eceeb89c153d8bf77dc194f8896a66cc25519a.tar.gz
cpython-94eceeb89c153d8bf77dc194f8896a66cc25519a.tar.bz2
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.
Diffstat (limited to 'Lib/dbm')
-rw-r--r--Lib/dbm/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/dbm/__init__.py b/Lib/dbm/__init__.py
index c224847..99c1637 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