From: Skip Montanaro <skip@pobox.com>
Date: Tue, 6 May 2003 20:42:10 +0000 (+0000)
Subject: detect old version 2 hash files and return "bsddb185" as the appropriate
X-Git-Tag: v2.3c1~830
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02cd36580fadb710ac05f7bc1e637ad886b506e8;p=python

detect old version 2 hash files and return "bsddb185" as the appropriate
module to load them
---

diff --git a/Lib/whichdb.py b/Lib/whichdb.py
index cc95ed512f..fed58e943b 100644
--- a/Lib/whichdb.py
+++ b/Lib/whichdb.py
@@ -86,11 +86,12 @@ def whichdb(filename):
     if magic == 0x13579ace:
         return "gdbm"
 
-    # Check for BSD hash
+    # Check for old Berkeley db hash file format v2
     if magic in (0x00061561, 0x61150600):
-        return "dbhash"
+        return "bsddb185"
 
-    # BSD hash v2 has a 12-byte NULL pad in front of the file type
+    # Later versions of Berkeley db hash file have a 12-byte pad in
+    # front of the file type
     try:
         (magic,) = struct.unpack("=l", s16[-4:])
     except struct.error: