Fixed DST handling for from_date/to_date, closes #193 (again)

tests/test_catalina_10_15_6.py

@@ -1029,8 +1029,15 @@ def test_photosinfo_repr():
 
 
 def test_from_to_date():
-    import osxphotos
+    """ test from_date / to_date """
     import datetime as dt
+    import os
+    import time
+
+    import osxphotos
+
+    os.environ["TZ"] = "US/Pacific"
+    time.tzset()
 
     photosdb = osxphotos.PhotosDB(PHOTOS_DB)
 
@@ -1046,6 +1053,50 @@ def test_from_to_date():
     assert len(photos) == 4
 
 
+def test_from_to_date_tz():
+    """ Test from_date / to_date with and without timezone """
+    import datetime as dt
+    import os
+    import time
+
+    import osxphotos
+
+    os.environ["TZ"] = "US/Pacific"
+    time.tzset()
+
+    photosdb = osxphotos.PhotosDB(PHOTOS_DB)
+
+    photos = photosdb.photos(
+        from_date=dt.datetime(2018, 9, 28, 13, 7, 0),
+        to_date=dt.datetime(2018, 9, 28, 13, 9, 0),
+    )
+    assert len(photos) == 1
+    assert photos[0].uuid == "D79B8D77-BFFC-460B-9312-034F2877D35B"
+
+    photos = photosdb.photos(
+        from_date=dt.datetime(
+            2018,
+            9,
+            28,
+            16,
+            7,
+            0,
+            tzinfo=dt.timezone(dt.timedelta(days=-1, seconds=72000)),
+        ),
+        to_date=dt.datetime(
+            2018,
+            9,
+            28,
+            16,
+            9,
+            0,
+            tzinfo=dt.timezone(dt.timedelta(days=-1, seconds=72000)),
+        ),
+    )
+    assert len(photos) == 1
+    assert photos[0].uuid == "D79B8D77-BFFC-460B-9312-034F2877D35B"
+
+
 def test_date_invalid():
     """ Test date is invalid """
     from datetime import datetime, timedelta, timezone

tests/test_datetime_utils.py

@@ -0,0 +1,90 @@
+""" test datetime_utils """
+import pytest
+
+
+def test_get_local_tz():
+    """ test get_local_tz during time with no DST """
+    import datetime
+    import os
+    import time
+
+    from osxphotos.datetime_utils import get_local_tz
+
+    os.environ["TZ"] = "US/Pacific"
+    time.tzset()
+
+    dt = datetime.datetime(2018, 12, 31, 0, 0, 0)
+    local_tz = get_local_tz(dt)
+    assert local_tz == datetime.timezone(
+        datetime.timedelta(days=-1, seconds=57600), "PST"
+    )
+
+
+def test_get_local_tz_dst():
+    """ test get_local_tz during time with DST """
+    import datetime
+    import os
+    import time
+
+    from osxphotos.datetime_utils import get_local_tz
+
+    os.environ["TZ"] = "US/Pacific"
+    time.tzset()
+
+    dt = datetime.datetime(2018, 6, 30, 0, 0, 0)
+    local_tz = get_local_tz(dt)
+    assert local_tz == datetime.timezone(
+        datetime.timedelta(days=-1, seconds=61200), "PDT"
+    )
+
+
+def test_datetime_remove_tz():
+    """ test datetime_remove_tz """
+    import datetime
+
+    from osxphotos.datetime_utils import datetime_remove_tz
+
+    dt = datetime.datetime(
+        2018,
+        12,
+        31,
+        tzinfo=datetime.timezone(datetime.timedelta(days=-1, seconds=57600), "PST"),
+    )
+    dt_no_tz = datetime_remove_tz(dt)
+    assert dt_no_tz.tzinfo is None
+
+
+def test_datetime_has_tz():
+    """ test datetime_has_tz """
+    import datetime
+
+    from osxphotos.datetime_utils import datetime_has_tz
+
+    dt = datetime.datetime(
+        2018,
+        12,
+        31,
+        tzinfo=datetime.timezone(datetime.timedelta(days=-1, seconds=57600), "PST"),
+    )
+    assert datetime_has_tz(dt)
+
+    dt_notz = datetime.datetime(2018, 12, 31)
+    assert not datetime_has_tz(dt_notz)
+
+
+def test_datetime_naive_to_local():
+    """ test datetime_naive_to_local """
+    import datetime
+    import os
+    import time
+
+    from osxphotos.datetime_utils import datetime_naive_to_local
+
+    os.environ["TZ"] = "US/Pacific"
+    time.tzset()
+
+    dt = datetime.datetime(2018, 6, 30, 0, 0, 0)
+    dt_local = datetime_naive_to_local(dt)
+    assert dt_local.tzinfo == datetime.timezone(
+        datetime.timedelta(days=-1, seconds=61200), "PDT"
+    )