Implemented #605, refactor out export2

tests/test_cli.py

@@ -4293,7 +4293,7 @@ def test_export_deleted_only_2():
 
 
 def test_export_error(monkeypatch):
-    """Test that export catches errors thrown by export2"""
+    """Test that export catches errors thrown by export"""
     # Note: I often comment out the try/except block in cli.py::export_photo_with_template when
     # debugging to see exactly where the error is
     # this test verifies I've re-enabled that code
@@ -4307,7 +4307,7 @@ def test_export_error(monkeypatch):
     def throw_error(*args, **kwargs):
         raise ValueError("Argh!")
 
-    monkeypatch.setattr(osxphotos.PhotoExporter, "export2", throw_error)
+    monkeypatch.setattr(osxphotos.PhotoExporter, "export", throw_error)
     with runner.isolated_filesystem():
         result = runner.invoke(
             export,

tests/test_export_convert_to_jpeg.py

@@ -40,7 +40,7 @@ def test_export_convert_raw_to_jpeg(photosdb):
     photos = photosdb.photos(uuid=[UUID_DICT["raw"]])
 
     export_options = ExportOptions(convert_to_jpeg=True)
-    results = PhotoExporter(photos[0]).export2(dest, options=export_options)
+    results = PhotoExporter(photos[0]).export(dest, options=export_options)
     got_dest = pathlib.Path(results.exported[0])
 
     assert got_dest.is_file()
@@ -58,7 +58,7 @@ def test_export_convert_heic_to_jpeg(photosdb):
     photos = photosdb.photos(uuid=[UUID_DICT["heic"]])
 
     export_options = ExportOptions(convert_to_jpeg=True)
-    results = PhotoExporter(photos[0]).export2(dest, options=export_options)
+    results = PhotoExporter(photos[0]).export(dest, options=export_options)
     got_dest = pathlib.Path(results.exported[0])
 
     assert got_dest.is_file()
@@ -86,7 +86,7 @@ def test_export_convert_live_heic_to_jpeg():
     photo = photosdb.get_photo(UUID_LIVE_HEIC)
 
     export_options = ExportOptions(convert_to_jpeg=True, live_photo=True)
-    results = PhotoExporter(photo).export2(dest, options=export_options)
+    results = PhotoExporter(photo).export(dest, options=export_options)
 
     for name in NAMES_LIVE_HEIC:
         assert f"{tempdir.name}/{name}" in results.exported

tests/test_sidecar_xmp.py

@@ -41,7 +41,7 @@ def test_sidecar_xmp(photosdb):
         dest = tempdir.name
         photo = photosdb.get_photo(uuid)
         export_options = ExportOptions(sidecar=SIDECAR_XMP)
-        PhotoExporter(photo).export2(
+        PhotoExporter(photo).export(
             dest, photo.original_filename, options=export_options
         )
         filepath = str(pathlib.Path(dest) / photo.original_filename)