Skip to content

model.datatypes: Fix parsing of long and negative XSD years #586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
paul-gerber-svg wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

model.datatypes: Fix parsing of long and negative XSD years #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions sdk/basyx/aas/model/datatypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,18 +638,21 @@ def _parse_xsd_bool(value: str) -> Boolean:
raise ValueError("Invalid literal for XSD bool type")


GYEAR_RE = re.compile(r'^(\d\d\d\d)([+\-]\d\d:\d\d|Z)?$')
GYEAR_RE = re.compile(r'^(-?)(\d{4,})([+\-]\d\d:\d\d|Z)?$')
GMONTH_RE = re.compile(r'^--(\d\d)([+\-]\d\d:\d\d|Z)?$')
GDAY_RE = re.compile(r'^---(\d\d)([+\-]\d\d:\d\d|Z)?$')
GYEARMONTH_RE = re.compile(r'^(\d\d\d\d)-(\d\d)([+\-]\d\d:\d\d|Z)?$')
GYEARMONTH_RE = re.compile(r'^(-?)(\d{4,})-(\d\d)([+\-]\d\d:\d\d|Z)?$')
GMONTHDAY_RE = re.compile(r'^--(\d\d)-(\d\d)([+\-]\d\d:\d\d|Z)?$')


def _parse_xsd_gyear(value: str) -> GYear:
match = GYEAR_RE.match(value)
if not match:
raise ValueError("Value is not a valid XSD GYear string")
return GYear(int(match[1]), _parse_xsd_date_tzinfo(match[2]))
year = int(match[2])
if match[1]:
year = -year
return GYear(year, _parse_xsd_date_tzinfo(match[3]))


def _parse_xsd_gmonth(value: str) -> GMonth:
Expand All @@ -670,7 +673,10 @@ def _parse_xsd_gyearmonth(value: str) -> GYearMonth:
match = GYEARMONTH_RE.match(value)
if not match:
raise ValueError("Value is not a valid XSD GYearMonth string")
return GYearMonth(int(match[1]), int(match[2]), _parse_xsd_date_tzinfo(match[3]))
year = int(match[2])
if match[1]:
year = -year
return GYearMonth(year, int(match[3]), _parse_xsd_date_tzinfo(match[4]))


def _parse_xsd_gmonthday(value: str) -> GMonthDay:
Expand Down
8 changes: 8 additions & 0 deletions sdk/test/model/test_datatypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,18 @@ def test_serialize_date(self) -> None:
def test_parse_partial_dates(self) -> None:
self.assertEqual(model.datatypes.GYear(2019),
model.datatypes.from_xsd("2019", model.datatypes.GYear))
self.assertEqual(model.datatypes.GYear(-2001),
model.datatypes.from_xsd("-2001", model.datatypes.GYear))
self.assertEqual(model.datatypes.GYear(20000),
model.datatypes.from_xsd("20000", model.datatypes.GYear))
self.assertEqual(model.datatypes.GMonth(7),
model.datatypes.from_xsd("--07", model.datatypes.GMonth))
self.assertEqual(model.datatypes.GYearMonth(2020, 5),
model.datatypes.from_xsd("2020-05", model.datatypes.GYearMonth))
self.assertEqual(model.datatypes.GYearMonth(-2001, 10),
model.datatypes.from_xsd("-2001-10", model.datatypes.GYearMonth))
self.assertEqual(model.datatypes.GYearMonth(20000, 5),
model.datatypes.from_xsd("20000-05", model.datatypes.GYearMonth))
self.assertEqual(model.datatypes.GMonthDay(12, 6),
model.datatypes.from_xsd("--12-06", model.datatypes.GMonthDay))
self.assertEqual(model.datatypes.GDay(23),
Expand Down
Loading