diff options
| author | Jesus Cea <jcea@jcea.es> | 2011-09-19 15:11:26 (GMT) |
|---|---|---|
| committer | Jesus Cea <jcea@jcea.es> | 2011-09-19 15:11:26 (GMT) |
| commit | a372de8408b28689c63cb5ec711e2dceffc05e92 (patch) | |
| tree | c25a78f5fc8bb263dbae10b1a0d717f584e4feb7 | |
| parent | 1cbd2ab4044dbef8e1c7cb0b694f30049f42e7f6 (diff) | |
| parent | bc566b00adb18c77331f5786525c4584984fda51 (diff) | |
| download | cpython-a372de8408b28689c63cb5ec711e2dceffc05e92.zip cpython-a372de8408b28689c63cb5ec711e2dceffc05e92.tar.gz cpython-a372de8408b28689c63cb5ec711e2dceffc05e92.tar.bz2 | |
Close #13007: whichdb should recognize gdbm 1.9 magic numbers
| -rw-r--r-- | Lib/dbm/__init__.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/dbm/__init__.py b/Lib/dbm/__init__.py index 76a43c4..813a29d 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 @@ -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. |