diff --git a/Lib/dbm/__init__.py b/Lib/dbm/__init__.py index 76a43c43f38..813a29d7092 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 6df52156636..c786d24a4d8 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -236,6 +236,8 @@ Core and Builtins - Issue #10829: Refactor PyUnicode_FromFormat(), use the same function to parse the format string in the 3 steps, fix crashs on invalid format strings. +- Issue #13007: whichdb should recognize gdbm 1.9 magic numbers. + - Issue #11246: Fix PyUnicode_FromFormat("%V") to decode the byte string from UTF-8 (with replace error handler) instead of ISO-8859-1 (in strict mode). Patch written by Ray Allen.