Skip to content

Commit f2cd21c

Browse files
committed
code style
Signed-off-by: Kunz, Immanuel <[email protected]>
1 parent 992b3c4 commit f2cd21c

File tree

4 files changed

+23
-10
lines changed

4 files changed

+23
-10
lines changed

src/univers/datetime.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,20 @@
44
# Visit https://aboutcode.org and https://github.com/aboutcode-org/univers for support and download.
55

66
import re
7+
78
from dateutil.parser import isoparse
89

10+
911
class DatetimeVersion:
1012
"""
1113
datetime version.
1214
1315
The timestamp must be RFC3339-compliant, i.e., a subset of ISO8601, where the date AND time are always specified. Therefore, we can use dateutil's ISO-parser but have to check for compliance with the RFC format first via a regex.
1416
"""
1517

16-
VERSION_PATTERN = re.compile(r'^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})$')
18+
VERSION_PATTERN = re.compile(
19+
r"^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})$"
20+
)
1721

1822
def __init__(self, version):
1923
if not self.is_valid(version):
@@ -41,6 +45,7 @@ def __ge__(self, other):
4145
@classmethod
4246
def is_valid(cls, string):
4347
return cls.VERSION_PATTERN.match(string)
44-
48+
49+
4550
class InvalidVersionError(ValueError):
46-
pass
51+
pass

src/univers/versions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ class DatetimeVersion(Version):
161161
@classmethod
162162
def is_valid(cls, string):
163163
return datetime.DatetimeVersion.is_valid(string)
164-
164+
165165
@classmethod
166166
def build_value(self, string):
167167
return datetime.DatetimeVersion(string)

tests/test_version_range.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -369,12 +369,20 @@ def test_version_range_intdot():
369369

370370

371371
def test_version_range_datetime():
372-
assert DatetimeVersion("2000-01-01T01:02:03.1234Z") in DatetimeVersionRange.from_string("vers:datetime/*")
373-
assert DatetimeVersion("2021-05-05T01:02:03Z") in DatetimeVersionRange.from_string("vers:datetime/>2021-01-01T01:02:03.1234Z|<2022-01-01T01:02:03.1234Z")
372+
assert DatetimeVersion("2000-01-01T01:02:03.1234Z") in DatetimeVersionRange.from_string(
373+
"vers:datetime/*"
374+
)
375+
assert DatetimeVersion("2021-05-05T01:02:03Z") in DatetimeVersionRange.from_string(
376+
"vers:datetime/>2021-01-01T01:02:03.1234Z|<2022-01-01T01:02:03.1234Z"
377+
)
374378
datetime_constraints = DatetimeVersionRange(
375379
constraints=(
376-
VersionConstraint(comparator=">", version=DatetimeVersion(string="2000-01-01T01:02:03Z")),
377-
VersionConstraint(comparator="<", version=DatetimeVersion(string="2002-01-01T01:02:03Z")),
380+
VersionConstraint(
381+
comparator=">", version=DatetimeVersion(string="2000-01-01T01:02:03Z")
382+
),
383+
VersionConstraint(
384+
comparator="<", version=DatetimeVersion(string="2002-01-01T01:02:03Z")
385+
),
378386
)
379387
)
380388
assert DatetimeVersion("2001-01-01T01:02:03Z") in datetime_constraints

tests/test_versions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,9 @@ def test_intdot_version():
234234

235235

236236
def test_datetime_version():
237-
assert DatetimeVersion("2023-10-28T18:30:00Z") == DatetimeVersion("2023-10-28T18:30:00Z")
237+
assert DatetimeVersion("2023-10-28T18:30:00Z") == DatetimeVersion("2023-10-28T18:30:00Z")
238238
assert DatetimeVersion("2023-01-11T10:10:10Z") > DatetimeVersion("2023-01-10T10:10:10Z")
239-
assert DatetimeVersion("2022-10-28T18:30:00Z") < DatetimeVersion("2023-10-28T18:30:00Z")
239+
assert DatetimeVersion("2022-10-28T18:30:00Z") < DatetimeVersion("2023-10-28T18:30:00Z")
240240
assert DatetimeVersion("2022-10-28T18:30:00Z") <= DatetimeVersion("2023-10-28T18:30:00Z")
241241
assert DatetimeVersion("2024-10-28T18:30:00Z") > DatetimeVersion("2023-10-28T18:30:00Z")
242242
assert DatetimeVersion("2023-10-28T19:30:00+01:00") == DatetimeVersion("2023-10-28T18:30:00Z")

0 commit comments

Comments
 (0)