summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesus Cea <jcea@jcea.es>2011-09-19 17:08:18 +0200
committerJesus Cea <jcea@jcea.es>2011-09-19 17:08:18 +0200
commitbc566b00adb18c77331f5786525c4584984fda51 (patch)
treec6d92298492ed5c9bb6386a1db73344d4bcc95c2
parent1d678f841363d8636cb02510d31e4e4fb9d8815f (diff)
downloadcpython-git-bc566b00adb18c77331f5786525c4584984fda51.tar.gz
Close #13007: whichdb should recognize gdbm 1.9 magic numbers
-rw-r--r--Lib/dbm/__init__.py2
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/dbm/__init__.py b/Lib/dbm/__init__.py
index 76a43c43f3..813a29d709 100644
--- a/Lib/dbm/__init__.py
+++ b/Lib/dbm/__init__.py
@@ -166,7 +166,7 @@ def whichdb(filename):
return ""
# Check for GNU dbm
- if magic == 0x13579ace:
+ if magic in (0x13579ace, 0x13579acd, 0x13579acf):
return "dbm.gnu"
# Later versions of Berkeley db hash file have a 12-byte pad in
diff --git a/Misc/NEWS b/Misc/NEWS
index 5289c3799d..bfe536925a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -55,6 +55,8 @@ Library
- Issue #11657: Fix sending file descriptors over 255 over a multiprocessing
Pipe.
+- Issue #13007: whichdb should recognize gdbm 1.9 magic numbers.
+
- Issue #12213: Fix a buffering bug with interleaved reads and writes that
could appear on BufferedRandom streams.