fixed formatting (#1096)

tests/conftest.py

@@ -18,7 +18,6 @@ if is_macos:
 
 from osxphotos.exiftool import _ExifToolProc
 
-
 # run timewarp tests (configured with --timewarp)
 TEST_TIMEWARP = False
 

tests/generate_sidecars_for_test.py

@@ -7,7 +7,7 @@
 import pathlib
 
 import osxphotos
-from osxphotos.photoexporter import PhotoExporter, ExportOptions
+from osxphotos.photoexporter import ExportOptions, PhotoExporter
 
 PHOTOS_DB_15_7 = "./tests/Test-10.15.7.photoslibrary/database/photos.db"
 PHOTOS_DB_14_6 = "./tests/Test-10.14.6.photoslibrary/database/photos.db"
@@ -92,9 +92,7 @@ def generate_sidecars(dbname, uuid_dict):
 
         # ignore_date_modified
         sidecar = str(pathlib.Path(SIDECAR_DIR) / f"{uuid}_ignore_date_modified.json")
-        json_ = exporter.exiftool_json_sidecar(
-            ExportOptions(ignore_date_modified=True)
-        )
+        json_ = exporter.exiftool_json_sidecar(ExportOptions(ignore_date_modified=True))
         with open(sidecar, "w") as file:
             file.write(json_)
 

tests/hyphen-dir/template_function.py

@@ -7,7 +7,7 @@ import osxphotos
 
 
 def foo(photo: osxphotos.PhotoInfo, **kwargs) -> Union[List, str]:
-    """ example function for {function} template
+    """example function for {function} template
 
     Args:
         photo: osxphotos.PhotoInfo object

tests/tempdiskimage.py

@@ -8,11 +8,11 @@ import time
 
 
 class TempDiskImage:
-    """ Create and mount a temporary disk image """
+    """Create and mount a temporary disk image"""
 
     def __init__(self, size=100, prefix=None):
-        """ Create and mount a temporary disk image.
-        
+        """Create and mount a temporary disk image.
+
         Args:
             size: int; size in MB of disk image, default = 100
             prefix: str; optional prefix to prepend to name of the temporary disk image
@@ -59,7 +59,7 @@ class TempDiskImage:
         self._mount_point, self.name = self._mount_image(self.path)
 
     def _mount_image(self, image_path):
-        """ mount a DMG file and return path, returns (mount_point, path) """
+        """mount a DMG file and return path, returns (mount_point, path)"""
         hdiutil = subprocess.run(
             ["/usr/bin/hdiutil", "attach", image_path],
             check=True,

tests/template_filter.py

@@ -10,8 +10,8 @@
 
 from typing import List
 
+
 def myfilter(values: List[str]) -> List[str]:
-    """ Custom filter to append "foo-" to template value """
+    """Custom filter to append "foo-" to template value"""
     values = ["foo-" + val for val in values]
     return values
-

tests/template_function.py

@@ -7,7 +7,7 @@ import osxphotos
 
 
 def foo(photo: osxphotos.PhotoInfo, **kwargs) -> Union[List, str]:
-    """ example function for {function} template
+    """example function for {function} template
 
     Args:
         photo: osxphotos.PhotoInfo object

tests/test_10_12_6.py

@@ -62,7 +62,6 @@ def test_photos_version(photosdb):
 
 
 def test_persons(photosdb):
-
     assert "Katie" in photosdb.persons
     assert collections.Counter(PERSONS) == collections.Counter(photosdb.persons)
 

tests/test_albums_folders_catalina_10_15_7.py

@@ -1,7 +1,6 @@
 import pytest
 
 import osxphotos
-
 from osxphotos._constants import _UNKNOWN_PERSON, AlbumSortOrder
 
 PHOTOS_DB = "./tests/Test-10.15.7.photoslibrary/database/photos.db"

tests/test_albums_folders_high_sierra_10_13_6.py

@@ -1,7 +1,6 @@
 import pytest
 
 import osxphotos
-
 from osxphotos._constants import _UNKNOWN_PERSON
 
 PHOTOS_DB = "./tests/Test-10.13.6.photoslibrary/database/photos.db"

tests/test_albums_folders_mojave_10_14_6.py

@@ -1,7 +1,6 @@
 import pytest
 
 import osxphotos
-
 from osxphotos._constants import _UNKNOWN_PERSON
 
 PHOTOS_DB = "./tests/Test-10.14.6.photoslibrary/database/photos.db"

tests/test_bigsur_10_16_0_1.py

@@ -226,6 +226,7 @@ def test_init4():
     # test invalid db
     import os
     import tempfile
+
     import osxphotos
 
     (bad_db, bad_db_name) = tempfile.mkstemp(suffix=".db", prefix="osxphotos-")
@@ -606,7 +607,6 @@ def test_keyword_2(photosdb):
 
 
 def test_keyword_not_in_album(photosdb):
-
     # find all photos with keyword "Kids" not in the album "Pumpkin Farm"
     photos1 = photosdb.photos(albums=["Pumpkin Farm"])
     photos2 = photosdb.photos(keywords=["Kids"])
@@ -1024,6 +1024,7 @@ def test_date_invalid():
     """Test date is invalid"""
     # doesn't run correctly with the module-level fixture
     from datetime import datetime, timedelta, timezone
+
     import osxphotos
 
     # UUID_DICT["date_invalid"] has an invalid date that's

tests/test_catalina_10_15_7.py

@@ -15,7 +15,7 @@ import pytest
 import osxphotos
 from osxphotos._constants import _UNKNOWN_PERSON
 from osxphotos.photoexporter import PhotoExporter
-from osxphotos.utils import is_macos, get_macos_version
+from osxphotos.utils import get_macos_version, is_macos
 
 OS_VERSION = get_macos_version() if is_macos else (None, None, None)
 SKIP_TEST = "OSXPHOTOS_TEST_EXPORT" not in os.environ or OS_VERSION[1] != "15"

tests/test_cli.py

@@ -14,9 +14,9 @@ import subprocess
 import tempfile
 import time
 from tempfile import TemporaryDirectory
-from bitmath import contextlib
 
 import pytest
+from bitmath import contextlib
 from click.testing import CliRunner
 
 import osxphotos

tests/test_cli_add_locations.py

@@ -4,8 +4,10 @@ import pytest
 from click.testing import CliRunner
 
 from osxphotos.utils import is_macos
+
 if is_macos:
     import photoscript
+
     from osxphotos.cli.add_locations import add_locations
 else:
     pytest.skip(allow_module_level=True)

tests/test_cli_add_to_album.py

@@ -6,6 +6,7 @@ import pytest
 from click.testing import CliRunner
 
 from osxphotos.utils import is_macos
+
 if is_macos:
     import photoscript
 else:

tests/test_cli_all_commands.py

@@ -24,6 +24,7 @@ TEST_RUN_SCRIPT = "examples/cli_example_1.py"
 def runner() -> CliRunner:
     return CliRunner()
 
+
 from osxphotos.cli import (
     about,
     albums,
@@ -43,7 +44,6 @@ from osxphotos.cli import (
     tutorial,
     version,
 )
-
 from osxphotos.utils import is_macos
 
 if is_macos:
@@ -72,7 +72,8 @@ def test_about(runner: CliRunner):
         places,
         tutorial,
         version,
-    ] + ([uuid] if is_macos else []),
+    ]
+    + ([uuid] if is_macos else []),
 )
 def test_cli_comands(runner: CliRunner, command: Callable[..., Any]):
     with runner.isolated_filesystem():

tests/test_cli_batch_edit.py

@@ -13,6 +13,7 @@ from osxphotos.utils import is_macos
 
 if is_macos:
     import photoscript
+
     from osxphotos.cli.batch_edit import batch_edit
 else:
     pytest.skip(allow_module_level=True)

tests/test_cli_dump.py

@@ -91,11 +91,12 @@ def test_dump_field(photos):
                 "name",
                 "{photo.original_filename}",
             ],
-                   )
+        )
         assert result.exit_code == 0
         for photo in photos:
             assert f"{photo.uuid},{photo.original_filename}" in result.output
 
+
 def test_dump_field_json(photos):
     """Test osxphotos dump --field --jso"""
     runner = CliRunner()
@@ -117,7 +118,7 @@ def test_dump_field_json(photos):
                 "{photo.original_filename}",
                 "--json",
             ],
-                   )
+        )
         assert result.exit_code == 0
         json_data = {record["uuid"]: record for record in json.loads(result.output)}
         for photo in photos:

tests/test_cli_import.py

@@ -14,7 +14,6 @@ from tempfile import TemporaryDirectory
 from typing import Dict
 
 import pytest
-
 from click.testing import CliRunner
 from pytest import MonkeyPatch, approx
 
@@ -27,6 +26,7 @@ from tests.conftest import get_os_version
 
 if is_macos:
     from photoscript import Photo
+
     from osxphotos.cli.import_cli import import_cli
 else:
     pytest.skip(allow_module_level=True)

tests/test_cli_param_types.py

@@ -1,12 +1,9 @@
 """ Test custom click paramater types used by osxphotos CLI"""
 
 import datetime
-from bitmath import MB
 
 import pytest
-
-from osxphotos.timezones import Timezone
-
+from bitmath import MB
 from click.exceptions import BadParameter
 
 from osxphotos.cli.param_types import (
@@ -21,6 +18,7 @@ from osxphotos.cli.param_types import (
     TimeString,
     UTCOffset,
 )
+from osxphotos.timezones import Timezone
 
 
 def test_date_offset():

tests/test_cli_sync.py

@@ -1,13 +1,16 @@
 """Test osxphotos sync command"""
 
-import os
 import json
+import os
+
 import pytest
 from click.testing import CliRunner
 
 from osxphotos.utils import is_macos
+
 if is_macos:
     import photoscript
+
     from osxphotos.cli.sync import sync
 else:
     pytest.skip(allow_module_level=True)

tests/test_cli_verbose.py

@@ -3,13 +3,12 @@
 import re
 from io import StringIO
 
-
 from osxphotos.cli.verbose import (
+    _reset_verbose_globals,
     get_verbose_level,
     set_verbose_level,
     verbose,
     verbose_print,
-    _reset_verbose_globals,
 )
 
 

tests/test_datetime_formatter.py

@@ -5,9 +5,10 @@ from .locale_util import setlocale
 
 
 def test_datetime_formatter_1():
-    """Test DateTimeFormatter """
+    """Test DateTimeFormatter"""
     import datetime
     import locale
+
     from osxphotos.datetime_formatter import DateTimeFormatter
 
     setlocale(locale.LC_ALL, "en_US")
@@ -29,9 +30,10 @@ def test_datetime_formatter_1():
 
 
 def test_datetime_formatter_2():
-    """Test DateTimeFormatter with hour > 12 """
+    """Test DateTimeFormatter with hour > 12"""
     import datetime
     import locale
+
     from osxphotos.datetime_formatter import DateTimeFormatter
 
     setlocale(locale.LC_ALL, "en_US")
@@ -53,9 +55,10 @@ def test_datetime_formatter_2():
 
 
 def test_datetime_formatter_3():
-    """Test DateTimeFormatter zero-padding  """
+    """Test DateTimeFormatter zero-padding"""
     import datetime
     import locale
+
     from osxphotos.datetime_formatter import DateTimeFormatter
 
     setlocale(locale.LC_ALL, "en_US")

tests/test_datetime_utils.py

@@ -1,4 +1,5 @@
 from datetime import date, timezone
+
 import pytest
 
 from osxphotos.datetime_utils import *
@@ -93,4 +94,4 @@ def test_datetime_utc_to_local_2():
     tz = datetime.timezone(offset=datetime.timedelta(seconds=7200))
     utc = datetime.datetime(2020, 9, 1, 19, 0, 0, tzinfo=datetime.timezone.utc)
     dt = datetime_utc_to_local(utc)
-    assert dt == datetime.datetime(2020, 9, 1, 21, 0, 0, tzinfo=tz)
+    assert dt == datetime.datetime(2020, 9, 1, 21, 0, 0, tzinfo=tz)

tests/test_empty_library_4_0.py

@@ -30,25 +30,28 @@ def test_db_version():
 
 
 def test_persons():
-    import osxphotos
     import collections
 
+    import osxphotos
+
     photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     assert photosdb.persons == []
 
 
 def test_keywords():
-    import osxphotos
     import collections
 
+    import osxphotos
+
     photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     assert photosdb.keywords == []
 
 
 def test_album_names():
-    import osxphotos
     import collections
 
+    import osxphotos
+
     photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     assert photosdb.albums == []
 

tests/test_exiftool_caching.py

@@ -1,4 +1,5 @@
 import pytest
+
 from osxphotos.exiftool import get_exiftool_path
 
 TEST_FILE_ONE_KEYWORD = "tests/test-images/wedding.jpg"
@@ -107,7 +108,7 @@ def test_version():
 
 
 def test_singleton():
-    """ tests per-file singleton behavior """
+    """tests per-file singleton behavior"""
     import osxphotos.exiftool
 
     exif1 = osxphotos.exiftool.ExifToolCaching(TEST_FILE_ONE_KEYWORD)
@@ -131,6 +132,7 @@ def test_setvalue_1():
     # test setting a tag value
     import os.path
     import tempfile
+
     import osxphotos.exiftool
     from osxphotos.fileutil import FileUtil
 
@@ -147,6 +149,7 @@ def test_setvalue_cache():
     # test setting a tag value doesn't affect cached value
     import os.path
     import tempfile
+
     import osxphotos.exiftool
     from osxphotos.fileutil import FileUtil
 
@@ -174,6 +177,7 @@ def test_setvalue_context_manager():
     # test setting a tag value as context manager
     import os.path
     import tempfile
+
     import osxphotos.exiftool
     from osxphotos.fileutil import FileUtil
 
@@ -190,6 +194,7 @@ def test_flags():
     # test that flags raise error
     import os.path
     import tempfile
+
     import osxphotos.exiftool
     from osxphotos.fileutil import FileUtil
 
@@ -207,6 +212,7 @@ def test_clear_value():
     # test clearing a tag value
     import os.path
     import tempfile
+
     import osxphotos.exiftool
     from osxphotos.fileutil import FileUtil
 
@@ -224,6 +230,7 @@ def test_addvalues_1():
     # test setting a tag value
     import os.path
     import tempfile
+
     import osxphotos.exiftool
     from osxphotos.fileutil import FileUtil
 
@@ -276,9 +283,10 @@ def test_as_dict_no_tag_groups():
 
 
 def test_json():
-    import osxphotos.exiftool
     import json
 
+    import osxphotos.exiftool
+
     exif1 = osxphotos.exiftool.ExifToolCaching(TEST_FILE_ONE_KEYWORD)
     exifdata = json.loads(exif1.json())
     assert exifdata[0]["XMP:TagsList"] == "wedding"
@@ -293,7 +301,7 @@ def test_str():
 
 
 def test_photoinfo_exiftool():
-    """ test PhotoInfo.exiftool which returns ExifTool object for photo """
+    """test PhotoInfo.exiftool which returns ExifTool object for photo"""
     import osxphotos
 
     photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
@@ -306,7 +314,7 @@ def test_photoinfo_exiftool():
 
 
 def test_photoinfo_exiftool_no_groups():
-    """ test PhotoInfo.exiftool which returns ExifTool object for photo without tag group names"""
+    """test PhotoInfo.exiftool which returns ExifTool object for photo without tag group names"""
     import osxphotos
 
     photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)

tests/test_export_catalina_10_15_7.py

@@ -357,7 +357,6 @@ def test_export_13(photosdb):
 
 
 def test_dd_to_dms_str_1():
-
     lat_str, lon_str = dd_to_dms_str(
         34.559331096, 69.206499174
     )  # Kabul, 34°33'33.59" N 69°12'23.40" E
@@ -367,7 +366,6 @@ def test_dd_to_dms_str_1():
 
 
 def test_dd_to_dms_str_2():
-
     lat_str, lon_str = dd_to_dms_str(
         -34.601997592, -58.375665164
     )  # Buenos Aires, 34°36'7.19" S 58°22'32.39" W
@@ -377,7 +375,6 @@ def test_dd_to_dms_str_2():
 
 
 def test_dd_to_dms_str_3():
-
     lat_str, lon_str = dd_to_dms_str(
         -1.2666656, 36.7999968
     )  # Nairobi, 1°15'60.00" S 36°47'59.99" E
@@ -387,7 +384,6 @@ def test_dd_to_dms_str_3():
 
 
 def test_dd_to_dms_str_4():
-
     lat_str, lon_str = dd_to_dms_str(
         38.889248, -77.050636
     )  # DC: 38° 53' 21.2928" N, 77° 3' 2.2896" W
@@ -397,7 +393,6 @@ def test_dd_to_dms_str_4():
 
 
 def test_exiftool_json_sidecar(photosdb):
-
     uuid = EXIF_JSON_UUID
     photo = photosdb.get_photo(uuid)
 
@@ -411,7 +406,6 @@ def test_exiftool_json_sidecar(photosdb):
 
 
 def test_exiftool_json_sidecar_ignore_date_modified(photosdb):
-
     uuid = EXIF_JSON_UUID
     photo = photosdb.get_photo(uuid)
 
@@ -469,9 +463,7 @@ def test_exiftool_json_sidecar_keyword_template_long(capsys, photosdb):
             assert json_got[k] == v
 
 
-
 def test_exiftool_json_sidecar_keyword_template(photosdb):
-
     uuid = EXIF_JSON_UUID
     photo = photosdb.get_photo(uuid)
 
@@ -488,7 +480,6 @@ def test_exiftool_json_sidecar_keyword_template(photosdb):
 
 
 def test_exiftool_json_sidecar_use_persons_keyword(photosdb):
-
     uuid = UUID_DICT["xmp"]
     photo = photosdb.get_photo(uuid)
 
@@ -506,7 +497,6 @@ def test_exiftool_json_sidecar_use_persons_keyword(photosdb):
 
 
 def test_exiftool_json_sidecar_use_albums_keywords(photosdb):
-
     uuid = UUID_DICT["xmp"]
     photo = photosdb.get_photo(uuid)
 
@@ -550,7 +540,6 @@ def test_xmp_sidecar_is_valid(tmp_path, photosdb):
 
 
 def test_xmp_sidecar(photosdb):
-
     uuid = UUID_DICT["xmp"]
     photos = photosdb.photos(uuid=[uuid])
 
@@ -575,7 +564,6 @@ def test_xmp_sidecar_extension(photosdb):
 
 
 def test_xmp_sidecar_use_persons_keyword(photosdb):
-
     uuid = UUID_DICT["xmp"]
     photo = photosdb.get_photo(uuid)
 
@@ -589,7 +577,6 @@ def test_xmp_sidecar_use_persons_keyword(photosdb):
 
 
 def test_xmp_sidecar_use_albums_keyword(photosdb):
-
     uuid = UUID_DICT["xmp"]
     photo = photosdb.get_photo(uuid)
 
@@ -616,7 +603,6 @@ def test_xmp_sidecar_gps(photosdb):
 
 
 def test_xmp_sidecar_keyword_template(photosdb):
-
     uuid = UUID_DICT["location"]
     photo = photosdb.get_photo(uuid)
 

tests/test_export_catalina_10_15_7_use_photos_export.py

@@ -1,8 +1,9 @@
 import os
+
 import pytest
 
 from osxphotos._constants import _UNKNOWN_PERSON
-from osxphotos.utils import is_macos, get_macos_version
+from osxphotos.utils import get_macos_version, is_macos
 
 OS_VERSION = get_macos_version() if is_macos else (None, None, None)
 SKIP_TEST = "OSXPHOTOS_TEST_EXPORT" not in os.environ or OS_VERSION[1] != "15"
@@ -123,6 +124,7 @@ def test_export_edited(photosdb):
 
 def test_export_edited_exiftool(photosdb):
     # test export edited file
+    import logging
     import os
     import os.path
     import pathlib
@@ -131,8 +133,6 @@ def test_export_edited_exiftool(photosdb):
     import osxphotos
     import osxphotos.exiftool
 
-    import logging
-
     tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
     dest = tempdir.name
     photos = photosdb.photos(uuid=[UUID_DICT["has_adjustments"]])

tests/test_export_db.py

@@ -2,9 +2,9 @@
 
 import os
 import pathlib
+import shutil
 import sqlite3
 import tempfile
-import shutil
 
 import pytest
 

tests/test_export_mojave_10_14_6.py

@@ -330,7 +330,6 @@ def test_export_13(photosdb):
 
 
 def test_exiftool_json_sidecar(photosdb):
-
     uuid = UUID_DICT["location"]
     photo = photosdb.get_photo(uuid)
 
@@ -344,7 +343,6 @@ def test_exiftool_json_sidecar(photosdb):
 
 
 def test_xmp_sidecar(photosdb):
-
     uuid = UUID_DICT["xmp"]
     photo = photosdb.get_photo(uuid)
 
@@ -357,7 +355,6 @@ def test_xmp_sidecar(photosdb):
 
 
 def test_xmp_sidecar_keyword_template(photosdb):
-
     uuid = UUID_DICT["xmp"]
     photo = photosdb.get_photo(uuid)
 

tests/test_export_raw_catalina_10_15_1.py

@@ -66,9 +66,9 @@ def test_export_edited_name():
     # export edited file with name provided
     import os
     import os.path
+    import pathlib
     import tempfile
     import time
-    import pathlib
 
     import osxphotos
 
@@ -109,10 +109,10 @@ def test_export_edited_wrong_suffix():
     # should produce a warning via logging.warning
     import os
     import os.path
+    import pathlib
     import sys
     import tempfile
     import time
-    import pathlib
 
     import osxphotos
 

tests/test_exportresults.py

@@ -1,6 +1,7 @@
 """ test ExportResults class """
 
 import pytest
+
 from osxphotos.photoexporter import ExportResults
 
 EXPORT_RESULT_ATTRIBUTES = ExportResults().attributes

tests/test_faceinfo.py

@@ -4074,7 +4074,7 @@ def photosdb4():
 
 @pytest.mark.parametrize("uuid_dict", UUID_LIST_5)
 def test_faceinfo_v5(photosdb5, uuid_dict):
-    """ Test FaceInfo object """
+    """Test FaceInfo object"""
     import json
 
     for uuid in uuid_dict:
@@ -4084,23 +4084,23 @@ def test_faceinfo_v5(photosdb5, uuid_dict):
         for face in faces:
             assert face.uuid in uuid_dict[uuid]
             # test by keys instead of dict == dict because Monterey+ dropped support for some of the face details
-            # and I didn't want to regenerate all the test data (e.g.eye, mouth coordinates) 
+            # and I didn't want to regenerate all the test data (e.g.eye, mouth coordinates)
             face_dict = face.asdict()
             for key in face_dict:
                 if key == "yaw":
-                    continue # yaw set to 0 as it's not in Ventura
+                    continue  # yaw set to 0 as it's not in Ventura
                 assert face_dict[key] == uuid_dict[uuid][face.uuid][key]
 
 
 def test_faceinfo_v5_no_face(photosdb5):
-    """ Test FaceInfo on image with no faces """
+    """Test FaceInfo on image with no faces"""
     photo = photosdb5.get_photo(UUID_NO_FACE_5)
     assert photo.face_info == []
 
 
 @pytest.mark.parametrize("uuid_dict", UUID_LIST_4)
 def test_faceinfo_v4(photosdb4, uuid_dict):
-    """ Test FaceInfo object """
+    """Test FaceInfo object"""
     import json
 
     for uuid in uuid_dict:
@@ -4110,13 +4110,13 @@ def test_faceinfo_v4(photosdb4, uuid_dict):
         for face in faces:
             assert face.uuid in uuid_dict[uuid]
             # test by keys instead of dict == dict because Monterey+ dropped support for some of the face details
-            # and I didn't want to regenerate all the test data (e.g.eye, mouth coordinates) 
+            # and I didn't want to regenerate all the test data (e.g.eye, mouth coordinates)
             face_dict = face.asdict()
             for key in face_dict:
                 assert face_dict[key] == uuid_dict[uuid][face.uuid][key]
 
 
 def test_faceinfo_v4_no_face(photosdb4):
-    """ Test FaceInfo on image with no faces """
+    """Test FaceInfo on image with no faces"""
     photo = photosdb4.get_photo(UUID_NO_FACE_4)
     assert photo.face_info == []

tests/test_highsierra.py

@@ -1,7 +1,6 @@
 import pytest
 
 import osxphotos
-
 from osxphotos._constants import _UNKNOWN_PERSON
 
 PHOTOS_DB = "./tests/Test-10.13.6.photoslibrary/database/photos.db"

tests/test_image_converter.py

@@ -19,7 +19,7 @@ TEST_IMAGE_DOES_NOT_EXIST = "tests/test-images/NOT-A-FILE.heic"
 
 
 def test_image_converter_singleton():
-    """ test that ImageConverter is a singleton """
+    """test that ImageConverter is a singleton"""
     from osxphotos.imageconverter import ImageConverter
 
     convert1 = ImageConverter()
@@ -29,9 +29,10 @@ def test_image_converter_singleton():
 
 
 def test_image_converter():
-    """ test conversion of different image types """
+    """test conversion of different image types"""
     import pathlib
     import tempfile
+
     from osxphotos.imageconverter import ImageConverter
 
     converter = ImageConverter()
@@ -50,9 +51,10 @@ def test_image_converter():
 
 
 def test_image_converter_compression_quality():
-    """ test conversion of different image types with custom compression quality """
+    """test conversion of different image types with custom compression quality"""
     import pathlib
     import tempfile
+
     from osxphotos.imageconverter import ImageConverter
 
     converter = ImageConverter()
@@ -69,9 +71,10 @@ def test_image_converter_compression_quality():
 
 
 def test_image_converter_bad_compression_quality():
-    """ test illegal compression quality """
+    """test illegal compression quality"""
     import pathlib
     import tempfile
+
     from osxphotos.imageconverter import ImageConverter
 
     converter = ImageConverter()
@@ -86,10 +89,11 @@ def test_image_converter_bad_compression_quality():
 
 
 def test_image_converter_bad_file():
-    """ Try to convert a file that's not an image """
+    """Try to convert a file that's not an image"""
     import pathlib
     import tempfile
-    from osxphotos.imageconverter import ImageConverter, ImageConversionError
+
+    from osxphotos.imageconverter import ImageConversionError, ImageConverter
 
     converter = ImageConverter()
     tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
@@ -101,9 +105,10 @@ def test_image_converter_bad_file():
 
 
 def test_image_converter_missing_file():
-    """ Try to convert a file that's not an image """
+    """Try to convert a file that's not an image"""
     import pathlib
     import tempfile
+
     from osxphotos.imageconverter import ImageConverter
 
     converter = ImageConverter()
@@ -113,4 +118,3 @@ def test_image_converter_missing_file():
         outfile = pathlib.Path(tempdir.name) / f"{imgfile.stem}.jpeg"
         with pytest.raises(FileNotFoundError):
             converter.write_jpeg(imgfile, outfile)
-

tests/test_incloud_mojave_10_14_6.py

@@ -19,6 +19,7 @@ UUID_DICT = {
 def photosdb():
     return osxphotos.PhotosDB(dbfile=PHOTOS_DB_CLOUD)
 
+
 def test_incloud(photosdb):
     photos = photosdb.photos(uuid=[UUID_DICT["incloud"]])
 

tests/test_modified_date_catalina_10_15_7.py

@@ -9,10 +9,12 @@ UUID_DICT = {
     "not_modified": "D05A5FE3-15FB-49A1-A15D-AB3DA6F8B068",
 }
 
+
 @pytest.fixture(scope="module")
 def photosdb():
     return osxphotos.PhotosDB(dbfile=PHOTOS_DB)
 
+
 def test_modified(photosdb):
     import datetime
 

tests/test_modified_date_mojave_10_14_6.py

@@ -11,6 +11,7 @@ UUID_DICT = {
     "not_modified": "35243F7D-88C4-4408-B516-C74406E90C15",
 }
 
+
 @pytest.fixture(scope="module")
 def photosdb():
     return osxphotos.PhotosDB(dbfile=PHOTOS_DB)

tests/test_mojave_10_14_6_path_edited.py

@@ -15,6 +15,7 @@ UUID_DICT = {
 def test_path_edited1():
     # test a valid edited path
     import os.path
+
     import osxphotos
 
     photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
@@ -29,6 +30,7 @@ def test_path_edited1():
 def test_path_edited2():
     # test a non-standard (not 00) edited path
     import os.path
+
     import osxphotos
 
     photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)

tests/test_monterey_12_0_1.py

@@ -232,6 +232,7 @@ def test_init4():
     # test invalid db
     import os
     import tempfile
+
     import osxphotos
 
     (bad_db, bad_db_name) = tempfile.mkstemp(suffix=".db", prefix="osxphotos-")
@@ -608,7 +609,6 @@ def test_keyword_2(photosdb):
 
 
 def test_keyword_not_in_album(photosdb):
-
     # find all photos with keyword "Kids" not in the album "Pumpkin Farm"
     photos1 = photosdb.photos(albums=["Pumpkin Farm"])
     photos2 = photosdb.photos(keywords=["Kids"])
@@ -1026,6 +1026,7 @@ def test_date_invalid():
     """Test date is invalid"""
     # doesn't run correctly with the module-level fixture
     from datetime import datetime, timedelta, timezone
+
     import osxphotos
 
     # UUID_DICT["date_invalid"] has an invalid date that's

tests/test_monterey_dev_beta_12_0_0.py

@@ -14,7 +14,7 @@ import pytest
 import osxphotos
 from osxphotos._constants import _UNKNOWN_PERSON
 from osxphotos.photoexporter import PhotoExporter
-from osxphotos.utils import is_macos, get_macos_version
+from osxphotos.utils import get_macos_version, is_macos
 
 OS_VERSION = get_macos_version() if is_macos else (None, None, None)
 # SKIP_TEST = "OSXPHOTOS_TEST_EXPORT" not in os.environ or OS_VERSION[1] != "17"
@@ -291,13 +291,11 @@ def test_init5(mocker):
 
 
 def test_db_len(photosdb):
-
     # assert photosdb.db_version in osxphotos._TESTED_DB_VERSIONS
     assert len(photosdb) == PHOTOS_DB_LEN
 
 
 def test_db_version(photosdb):
-
     # assert photosdb.db_version in osxphotos._TESTED_DB_VERSIONS
     assert photosdb.db_version == "6000"
 
@@ -307,46 +305,39 @@ def test_photos_version(photosdb):
 
 
 def test_persons(photosdb):
-
     assert "Katie" in photosdb.persons
     assert Counter(PERSONS) == Counter(photosdb.persons)
 
 
 def test_keywords(photosdb):
-
     assert "wedding" in photosdb.keywords
     assert Counter(KEYWORDS) == Counter(photosdb.keywords)
 
 
 def test_album_names(photosdb):
-
     assert "Pumpkin Farm" in photosdb.albums
     assert Counter(ALBUMS) == Counter(photosdb.albums)
 
 
 def test_keywords_dict(photosdb):
-
     keywords = photosdb.keywords_as_dict
     assert keywords["wedding"] == 3
     assert keywords == KEYWORDS_DICT
 
 
 def test_persons_as_dict(photosdb):
-
     persons = photosdb.persons_as_dict
     assert persons["Maria"] == 2
     assert persons == PERSONS_DICT
 
 
 def test_albums_as_dict(photosdb):
-
     albums = photosdb.albums_as_dict
     assert albums["Pumpkin Farm"] == 3
     assert albums == ALBUM_DICT
 
 
 def test_album_sort_order(photosdb):
-
     album = [a for a in photosdb.album_info if a.title == "Pumpkin Farm"][0]
     photos = album.photos
 
@@ -355,14 +346,12 @@ def test_album_sort_order(photosdb):
 
 
 def test_album_empty_album(photosdb):
-
     album = [a for a in photosdb.album_info if a.title == "EmptyAlbum"][0]
     photos = album.photos
     assert photos == []
 
 
 def test_attributes(photosdb):
-
     photos = photosdb.photos(uuid=["D79B8D77-BFFC-460B-9312-034F2877D35B"])
     assert len(photos) == 1
     p = photos[0]
@@ -434,7 +423,6 @@ def test_attributes_2(photosdb):
 
 
 def test_missing(photosdb):
-
     photos = photosdb.photos(uuid=[UUID_DICT["missing"]])
     assert len(photos) == 1
     p = photos[0]
@@ -443,7 +431,6 @@ def test_missing(photosdb):
 
 
 def test_favorite(photosdb):
-
     photos = photosdb.photos(uuid=[UUID_DICT["favorite"]])
     assert len(photos) == 1
     p = photos[0]
@@ -451,7 +438,6 @@ def test_favorite(photosdb):
 
 
 def test_not_favorite(photosdb):
-
     photos = photosdb.photos(uuid=[UUID_DICT["not_favorite"]])
     assert len(photos) == 1
     p = photos[0]
@@ -459,7 +445,6 @@ def test_not_favorite(photosdb):
 
 
 def test_hidden(photosdb):
-
     photos = photosdb.photos(uuid=[UUID_DICT["hidden"]])
     assert len(photos) == 1
     p = photos[0]
@@ -467,7 +452,6 @@ def test_hidden(photosdb):
 
 
 def test_not_hidden(photosdb):
-
     photos = photosdb.photos(uuid=[UUID_DICT["not_hidden"]])
     assert len(photos) == 1
     p = photos[0]
@@ -606,7 +590,6 @@ def test_not_ismovie(photosdb):
 
 
 def test_count(photosdb):
-
     photos = photosdb.photos()
     assert len(photos) == PHOTOS_NOT_IN_TRASH_LEN
 
@@ -685,13 +668,11 @@ def test_photoinfo_not_intrash(photosdb):
 
 
 def test_keyword_2(photosdb):
-
     photos = photosdb.photos(keywords=["wedding"])
     assert len(photos) == 2  # won't show the one in the trash
 
 
 def test_keyword_not_in_album(photosdb):
-
     # find all photos with keyword "Kids" not in the album "Pumpkin Farm"
     photos1 = photosdb.photos(albums=["Pumpkin Farm"])
     photos2 = photosdb.photos(keywords=["Kids"])
@@ -708,20 +689,17 @@ def test_album_folder_name(photosdb):
 
 
 def test_multi_person(photosdb):
-
     photos = photosdb.photos(persons=["Katie", "Suzy"])
 
     assert len(photos) == 3
 
 
 def test_get_db_path(photosdb):
-
     db_path = photosdb.db_path
     assert db_path.endswith(PHOTOS_DB_PATH)
 
 
 def test_get_library_path(photosdb):
-
     lib_path = photosdb.library_path
     assert lib_path.endswith(PHOTOS_LIBRARY_PATH)
 
@@ -1028,14 +1006,12 @@ def test_eq_2():
 
 
 def test_not_eq(photosdb):
-
     photos1 = photosdb.photos(uuid=[UUID_DICT["export"]])
     photos2 = photosdb.photos(uuid=[UUID_DICT["missing"]])
     assert photos1[0] != photos2[0]
 
 
 def test_photosdb_repr():
-
     photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     photosdb2 = eval(repr(photosdb))
 
@@ -1046,7 +1022,6 @@ def test_photosdb_repr():
 
 
 def test_photosinfo_repr(photosdb):
-
     photos = photosdb.photos(uuid=[UUID_DICT["favorite"]])
     photo = photos[0]
     photo2 = eval(repr(photo))

tests/test_movies_4_0.py

@@ -33,15 +33,17 @@ def test_db_version():
 
 
 def test_keywords():
-    import osxphotos
     import collections
 
+    import osxphotos
+
     photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     assert "test" in photosdb.keywords
 
 
 def test_attributes():
     import datetime
+
     import osxphotos
 
     photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)

tests/test_movies_5_0.py

@@ -36,15 +36,17 @@ def test_db_version():
 
 
 def test_keywords():
-    import osxphotos
     import collections
 
+    import osxphotos
+
     photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     assert "test" in photosdb.keywords
 
 
 def test_attributes():
     import datetime
+
     import osxphotos
 
     photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)

tests/test_path_utils.py

@@ -5,7 +5,6 @@ from osxphotos.path_utils import sanitize_filename
 
 
 def test_sanitize_filename():
-
     # basic sanitize
     filenames = {
         "Foobar.txt": "Foobar.txt",

tests/test_photokit.py

@@ -7,15 +7,16 @@ import tempfile
 import pytest
 
 from osxphotos.utils import is_macos
+
 if is_macos:
     from osxphotos.photokit import (
+        PHOTOS_VERSION_CURRENT,
+        PHOTOS_VERSION_ORIGINAL,
+        PHOTOS_VERSION_UNADJUSTED,
         LivePhotoAsset,
         PhotoAsset,
         PhotoLibrary,
         VideoAsset,
-        PHOTOS_VERSION_CURRENT,
-        PHOTOS_VERSION_ORIGINAL,
-        PHOTOS_VERSION_UNADJUSTED,
     )
 else:
     pytest.skip(allow_module_level=True)

tests/test_places_catalina_10_15_1.py

@@ -1,7 +1,6 @@
 """ Test PlaceInfo """
 import pytest
 
-
 PHOTOS_DB = "./tests/Test-Places-Catalina-10_15_1.photoslibrary/database/photos.db"
 
 UUID_DICT = {

tests/test_score_info.py

@@ -1,6 +1,7 @@
 """ Test ScoreInfo """
 
 from math import isclose
+
 import pytest
 
 from osxphotos.scoreinfo import ScoreInfo
@@ -78,7 +79,7 @@ def photosdb():
 
 
 def test_score_info_v5(photosdb):
-    """ test score """
+    """test score"""
     # use math.isclose to compare floats
     # on MacOS x64 these can probably compared for equality but would possibly
     # fail if osxphotos ever ported to other platforms
@@ -89,7 +90,7 @@ def test_score_info_v5(photosdb):
 
 
 def test_score_info_v4():
-    """ test version 4, score should be None """
+    """test version 4, score should be None"""
     import osxphotos
 
     photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB_4)

tests/test_search_info_10_14_6.py

@@ -6,7 +6,6 @@ import pytest
 
 from osxphotos._constants import _UNKNOWN_PERSON
 
-
 PHOTOS_DB = "./tests/Test-10.14.6.photoslibrary/database/photos.db"
 
 LABELS_DICT = {

tests/test_search_info_10_15_4.py

@@ -4,7 +4,6 @@ import pytest
 
 from osxphotos._constants import _UNKNOWN_PERSON
 
-
 PHOTOS_DB = "./tests/Test-10.15.4.photoslibrary/database/photos.db"
 PHOTOS_DB_PATH = "/Test-10.15.4.photoslibrary/database/photos.db"
 PHOTOS_LIBRARY_PATH = "/Test-10.15.4.photoslibrary"

tests/test_search_info_10_15_5.py

@@ -4,7 +4,6 @@ import pytest
 
 from osxphotos._constants import _UNKNOWN_PERSON
 
-
 PHOTOS_DB = "./tests/Test-10.15.5.photoslibrary/database/photos.db"
 PHOTOS_DB_PATH = "/Test-10.15.5.photoslibrary/database/photos.db"
 PHOTOS_LIBRARY_PATH = "/Test-10.15.5.photoslibrary"

tests/test_shared_mojave_10_14_6.py

@@ -1,6 +1,5 @@
 import pytest
 
-
 PHOTOS_DB = "./tests/Test-10.14.6.photoslibrary/database/photos.db"
 PHOTOS_DB_PATH = "/Test-10.14.6.photoslibrary/database/photos.db"
 PHOTOS_LIBRARY_PATH = "/Test-10.14.6.photoslibrary"
@@ -18,6 +17,7 @@ PHOTOS_DB_LEN = 13
 PHOTOS_NOT_IN_TRASH_LEN = 12
 PHOTOS_IN_TRASH_LEN = 1
 
+
 def test_album_names():
     import osxphotos
 

tests/test_specials_bigsur_10_16_0.py

@@ -30,6 +30,7 @@ def test_portrait1():
     photos = photosdb.photos(uuid=[UUID_DICT["no_specials"]])
     assert not photos[0].portrait
 
+
 def test_portrait2():
     import osxphotos
 

tests/test_sqlite_utils.py

@@ -1,21 +1,19 @@
 """Tests for sqlite_utils """
 
-import pytest
 import sqlite3
 
-from osxphotos.sqlite_utils import sqlite_open_ro, sqlite_db_is_locked
+import pytest
 
+from osxphotos.sqlite_utils import sqlite_db_is_locked, sqlite_open_ro
 
 DB_UNLOCKED_10_15 = "./tests/Test-10.15.1.photoslibrary/database/photos.db"
 
 
 def test_db_is_locked_unlocked():
-
     assert not sqlite_db_is_locked(DB_UNLOCKED_10_15)
 
 
 def test_open_sqlite_ro():
-
     conn, cur = sqlite_open_ro(DB_UNLOCKED_10_15)
     assert isinstance(conn, sqlite3.Connection)
     assert isinstance(cur, sqlite3.Cursor)

tests/test_template.py

@@ -7,6 +7,7 @@ import pytest
 import osxphotos
 from osxphotos.exiftool import get_exiftool_path
 from osxphotos.export_db import ExportDBInMemory
+from osxphotos.photoinfo import PhotoInfoNone
 from osxphotos.phototemplate import (
     PUNCTUATION,
     TEMPLATE_SUBSTITUTIONS,
@@ -14,10 +15,10 @@ from osxphotos.phototemplate import (
     PhotoTemplate,
     RenderOptions,
 )
-from osxphotos.photoinfo import PhotoInfoNone
 from osxphotos.utils import is_macos
-from .photoinfo_mock import PhotoInfoMock
+
 from .locale_util import setlocale
+from .photoinfo_mock import PhotoInfoMock
 
 try:
     exiftool = get_exiftool_path()

tests/test_ventura_dev_preview_13_0_0.py

@@ -608,7 +608,6 @@ def test_keyword_2(photosdb):
 
 
 def test_keyword_not_in_album(photosdb):
-
     # find all photos with keyword "Kids" not in the album "Pumpkin Farm"
     photos1 = photosdb.photos(albums=["Pumpkin Farm"])
     photos2 = photosdb.photos(keywords=["Kids"])