Merge main into sweep/replace-type-with-isinstance

osxphotos/cli/verbose.py

@@ -275,4 +275,4 @@ def _verbose_print_function(
     elif rich:
         return rich_verbose_testing_
     else:
-        return verbose_
+        return verbose_

osxphotos/exiftool.py

@@ -521,4 +521,4 @@ class _ExifToolCaching(ExifTool):
     def flush_cache(self):
         """Clear cached data so that calls to json or asdict return fresh data"""
         self._json_cache = None
-        self._asdict_cache = {}
+        self._asdict_cache = {}

osxphotos/sqlgrep.py

@@ -40,7 +40,7 @@ def sqlgrep(
                 for row_num, row in enumerate(cursor):
                     for field in row.keys():
                         field_value = row[field]
-                        if not field_value or type(field_value) == bytes:
+                        if not field_value or isinstance(field_value, bytes):
                             # don't search binary blobs
                             next
                         field_value = str(field_value)
@@ -54,4 +54,4 @@ def sqlgrep(
                                 field_value,
                             ]
     except sqlite3.DatabaseError as e:
-        raise sqlite3.DatabaseError(f"{filename}: {e}") from e
+        raise sqlite3.DatabaseError(f"{filename}: {e}") from e