diff options
| author | Skip Montanaro <skip@pobox.com> | 2003-05-06 20:42:10 (GMT) |
|---|---|---|
| committer | Skip Montanaro <skip@pobox.com> | 2003-05-06 20:42:10 (GMT) |
| commit | 02cd36580fadb710ac05f7bc1e637ad886b506e8 (patch) | |
| tree | ce0855383bd49177d1da20e1244faa7a719b3256 | |
| parent | 6d9f45bc3f9b408cd1e80c341c9ca76b30b7c01b (diff) | |
| download | cpython-02cd36580fadb710ac05f7bc1e637ad886b506e8.zip cpython-02cd36580fadb710ac05f7bc1e637ad886b506e8.tar.gz cpython-02cd36580fadb710ac05f7bc1e637ad886b506e8.tar.bz2 | |
detect old version 2 hash files and return "bsddb185" as the appropriate
module to load them
| -rw-r--r-- | Lib/whichdb.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/whichdb.py b/Lib/whichdb.py index cc95ed5..fed58e9 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: |