Merge branch 'main' into feature/odl-dont-show-expired-items

api/onix.py

@@ -20,7 +20,7 @@
     Representation,
     Subject,
     LicensePool, EditionConstants)
-from core.util.datetime_helpers import strptime_utc
+from core.util.datetime_helpers import to_utc
 from core.util.xmlparser import XMLParser
 
 
@@ -224,6 +224,12 @@ def parse(cls, file, data_source_name, default_medium=None):
             issued = None
             if publishing_date:
                 issued = dateutil.parser.isoparse(publishing_date)
+                if issued.tzinfo is None:
+                    cls._logger.warning(
+                        "Publishing date {} does not contain timezone information. Assuming UTC."
+                        .format(publishing_date)
+                    )
+                issued = to_utc(issued)
 
             identifier_tags = parser._xpath(record, 'productidentifier')
             identifiers = []

scripts.py

@@ -1747,7 +1747,7 @@ def _locate_file(cls, base_filename, directory, extensions,
                         ext.lower()
                     )
                     content = None
-                    with open_f(path) as fh:
+                    with open_f(path, "rb") as fh:
                         content = fh.read()
                     return filename, media_type, content
 

tests/test_scripts.py

@@ -1365,7 +1365,7 @@ def mock_exists(path):
             return path in mock_filesystem
 
         @contextlib.contextmanager
-        def mock_open(path):
+        def mock_open(path, mode="r"):
             yield StringIO(mock_filesystem[path])
         mock_filesystem_operations = mock_exists, mock_open