Page MenuHomeSoftware Heritage
Files F7124849

D5868.id21008.diff
No OneTemporary
Actions

D5868.id21008.diff
View Options

diff --git a/swh/model/identifiers.py b/swh/model/identifiers.py
--- a/swh/model/identifiers.py
+++ b/swh/model/identifiers.py
@@ -360,8 +360,10 @@
if negative_utc is None:
negative_utc = False
elif isinstance(time_representation, datetime.datetime):
- seconds = int(time_representation.timestamp())
microseconds = time_representation.microsecond
+ if microseconds:
+ time_representation = time_representation.replace(microsecond=0)
+ seconds = int(time_representation.timestamp())
utcoffset = time_representation.utcoffset()
if utcoffset is None:
raise ValueError(
diff --git a/swh/model/tests/test_identifiers.py b/swh/model/tests/test_identifiers.py
--- a/swh/model/tests/test_identifiers.py
+++ b/swh/model/tests/test_identifiers.py
@@ -1172,6 +1172,34 @@
normalize_timestamp(dict_input)
+TS_TIMEZONES = [
+ datetime.timezone.min,
+ datetime.timezone(datetime.timedelta(hours=-1)),
+ datetime.timezone.utc,
+ datetime.timezone(datetime.timedelta(minutes=+60)),
+ datetime.timezone.max,
+]
+TS_TZ_EXPECTED = [-1439, -60, 0, 60, 1439]
+TS_DATETIMES = [
+ datetime.datetime(2020, 2, 27, 14, 39, 19),
+ datetime.datetime(2120, 12, 31, 23, 59, 59),
+ datetime.datetime(1610, 5, 14, 15, 43, 0),
+]
+TS_DT_EXPECTED = [1582810759, 4765129199, -11348929581]
+
+
+@pytest.mark.parametrize("date, seconds", zip(TS_DATETIMES, TS_DT_EXPECTED))
+@pytest.mark.parametrize("tz, offset", zip(TS_TIMEZONES, TS_TZ_EXPECTED))
+@pytest.mark.parametrize("microsecond", [0, 1, 10, 100, 1000, 999999])
+def test_normalize_timestamp_datetime(date, seconds, tz, offset, microsecond):
+ date = date.astimezone(tz).replace(microsecond=microsecond)
+ assert normalize_timestamp(date) == {
+ "timestamp": {"seconds": seconds, "microseconds": microsecond},
+ "offset": offset,
+ "negative_utc": False,
+ }
+
+
# SWHIDs that are outright invalid, no matter the context
INVALID_SWHIDS = [
"swh:1:cnt",

File Metadata

Mime Type
text/plain
Expires
Dec 21 2024, 9:49 PM (11 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3218747

Event Timeline

About · Developer information · Legal