From 5359c434e16ef2c04b69198ecda35dd370d40bf5 Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <vlorentz@softwareheritage.org>
Date: Fri, 21 Jan 2022 14:57:22 +0100
Subject: [PATCH] Remove deprecated property 'TimestampWithTimezone.offset'
---
swh/model/model.py | 9 ++-------
swh/model/tests/test_model.py | 18 +++++++++---------
2 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/swh/model/model.py b/swh/model/model.py
index 0247e03e..7bed1c37 100644
--- a/swh/model/model.py
+++ b/swh/model/model.py
@@ -408,7 +408,7 @@ class TimestampWithTimezone(BaseModel):
(hours, minutes) = divmod(abs(offset), 60)
offset_bytes = f"{'-' if negative else '+'}{hours:02}{minutes:02}".encode()
tstz = TimestampWithTimezone(timestamp=timestamp, offset_bytes=offset_bytes)
- assert tstz.offset == offset, (tstz.offset, offset)
+ assert tstz.offset_minutes() == offset, (tstz.offset_minutes(), offset)
return tstz
@classmethod
@@ -489,7 +489,7 @@ class TimestampWithTimezone(BaseModel):
"""
timestamp = datetime.datetime.fromtimestamp(
self.timestamp.seconds,
- datetime.timezone(datetime.timedelta(minutes=self.offset)),
+ datetime.timezone(datetime.timedelta(minutes=self.offset_minutes())),
)
timestamp = timestamp.replace(microsecond=self.timestamp.microseconds)
return timestamp
@@ -577,11 +577,6 @@ class TimestampWithTimezone(BaseModel):
"""
return self._parse_offset_bytes(self.offset_bytes)
- @property
- def offset(self):
- """Deprecated alias of :meth:`offset_minutes`."""
- return self.offset_minutes()
-
@attr.s(frozen=True, slots=True)
class Origin(HashableObject, BaseModel):
diff --git a/swh/model/tests/test_model.py b/swh/model/tests/test_model.py
index 9c1541e3..6d97e59f 100644
--- a/swh/model/tests/test_model.py
+++ b/swh/model/tests/test_model.py
@@ -452,47 +452,47 @@ def test_timestampwithtimezone():
ts = Timestamp(seconds=0, microseconds=0)
tstz = TimestampWithTimezone(timestamp=ts, offset_bytes=b"+0000")
attr.validate(tstz)
- assert tstz.offset == 0
+ assert tstz.offset_minutes() == 0
assert tstz.offset_bytes == b"+0000"
tstz = TimestampWithTimezone(timestamp=ts, offset_bytes=b"+0010")
attr.validate(tstz)
- assert tstz.offset == 10
+ assert tstz.offset_minutes() == 10
assert tstz.offset_bytes == b"+0010"
tstz = TimestampWithTimezone(timestamp=ts, offset_bytes=b"-0010")
attr.validate(tstz)
- assert tstz.offset == -10
+ assert tstz.offset_minutes() == -10
assert tstz.offset_bytes == b"-0010"
tstz = TimestampWithTimezone(timestamp=ts, offset_bytes=b"-0000")
attr.validate(tstz)
- assert tstz.offset == 0
+ assert tstz.offset_minutes() == 0
assert tstz.offset_bytes == b"-0000"
tstz = TimestampWithTimezone(timestamp=ts, offset_bytes=b"-1030")
attr.validate(tstz)
- assert tstz.offset == -630
+ assert tstz.offset_minutes() == -630
assert tstz.offset_bytes == b"-1030"
tstz = TimestampWithTimezone(timestamp=ts, offset_bytes=b"+1320")
attr.validate(tstz)
- assert tstz.offset == 800
+ assert tstz.offset_minutes() == 800
assert tstz.offset_bytes == b"+1320"
tstz = TimestampWithTimezone(timestamp=ts, offset_bytes=b"+200")
attr.validate(tstz)
- assert tstz.offset == 120
+ assert tstz.offset_minutes() == 120
assert tstz.offset_bytes == b"+200"
tstz = TimestampWithTimezone(timestamp=ts, offset_bytes=b"+02")
attr.validate(tstz)
- assert tstz.offset == 120
+ assert tstz.offset_minutes() == 120
assert tstz.offset_bytes == b"+02"
tstz = TimestampWithTimezone(timestamp=ts, offset_bytes=b"+2000000000")
attr.validate(tstz)
- assert tstz.offset == 0
+ assert tstz.offset_minutes() == 0
assert tstz.offset_bytes == b"+2000000000"
with pytest.raises(AttributeTypeError):
--
GitLab