Extra checks for reading pickle-Format files (cctbx#744)

dials · Aug 16, 2024 · 38c95db · 38c95db
1 parent 6c83b6e
commit 38c95db
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/newsfragments/744.bugfix b/newsfragments/744.bugfix
@@ -0,0 +1 @@
+Add fix for pickle files
diff --git a/src/dxtbx/format/FormatPYmultitile.py b/src/dxtbx/format/FormatPYmultitile.py
@@ -20,7 +20,7 @@ def understand(image_file):
             with FormatPYmultitile.open_file(image_file, "rb") as fh:
                 data = pickle.load(fh, encoding="bytes")
                 data = image_dict_to_unicode(data)
-        except OSError:
+        except (AttributeError, OSError):
             return False
 
         wanted_header_items = ["TILES", "METROLOGY"]

diff --git a/src/dxtbx/format/FormatPYunspecified.py b/src/dxtbx/format/FormatPYunspecified.py
@@ -27,7 +27,7 @@ def understand(image_file):
             with FormatPYunspecified.open_file(image_file, "rb") as fh:
                 data = pickle.load(fh, encoding="bytes")
                 data = image_dict_to_unicode(data)
-        except OSError:
+        except (AttributeError, OSError):
             return False
 
         headers = set(data)