From 82866124bd088338ba766f5852f56293c62e3365 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sat, 14 Jun 2003 08:17:28 +0000 Subject: [PATCH] Treat empty dat/dir files as dumbdbm. Fixes #744687. --- Lib/whichdb.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Lib/whichdb.py b/Lib/whichdb.py index 8b31003d9b18..fba7ccc8423c 100644 --- a/Lib/whichdb.py +++ b/Lib/whichdb.py @@ -29,15 +29,19 @@ def whichdb(filename): # Check for dumbdbm next -- this has a .dir and and a .dat file try: - f = open(filename + os.extsep + "dat", "rb") - f.close() + # First check for presence of files + sizes = os.stat(filename + os.extsep + "dat").st_size, \ + os.stat(filename + os.extsep + "dir").st_size + # dumbdbm files with no keys are empty + if sizes == (0, 0): + return "dumbdbm" f = open(filename + os.extsep + "dir", "rb") try: if f.read(1) in ["'", '"']: return "dumbdbm" finally: f.close() - except IOError: + except (OSError, IOError): pass # See if the file exists, return None if not -- 2.47.3