Skip to content

parser(fix): more robust (UTC prefix in TzInfoParser #1165

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

parser(fix): more robust (UTC prefix in TzInfoParser #1165

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
4 changes: 2 additions & 2 deletions arrow/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@ def _generate_choice_re(

class TzinfoParser:
_TZINFO_RE: ClassVar[Pattern[str]] = re.compile(
r"^(?:\(UTC)*([\+\-])?(\d{2})(?:\:?(\d{2}))?"
r"^(?:(\(UTC))*([\+\-])?(\d{2})(?:\:?(\d{2}))?(?(1)\)|$)"
)

@classmethod
Expand All @@ -754,7 +754,7 @@ def parse(cls, tzinfo_string: str) -> dt_tzinfo:
sign: Optional[str]
hours: str
minutes: Union[str, int, None]
sign, hours, minutes = iso_match.groups()
_, sign, hours, minutes = iso_match.groups()
seconds = int(hours) * 3600 + int(minutes or 0) * 60

if sign == "-":
Expand Down
24 changes: 19 additions & 5 deletions tests/test_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1316,9 +1316,8 @@ def test_parse_utc(self):
assert self.parser.parse("UTC") == tz.tzutc()

def test_parse_utc_withoffset(self):
assert self.parser.parse("(UTC+01:00") == tz.tzoffset(None, 3600)
assert self.parser.parse("(UTC-01:00") == tz.tzoffset(None, -3600)
assert self.parser.parse("(UTC+01:00") == tz.tzoffset(None, 3600)
assert self.parser.parse("(UTC-01:00)") == tz.tzoffset(None, -3600)
assert self.parser.parse("(UTC+01:00)") == tz.tzoffset(None, 3600)
assert self.parser.parse(
"(UTC+01:00) Amsterdam, Berlin, Bern, Rom, Stockholm, Wien"
) == tz.tzoffset(None, 3600)
Expand All @@ -1341,8 +1340,23 @@ def test_parse_str(self):
assert self.parser.parse("US/Pacific") == tz.gettz("US/Pacific")

def test_parse_fails(self):
with pytest.raises(parser.ParserError):
self.parser.parse("fail")
pytest.raises(parser.ParserError, self.parser.parse, "fail")
pytest.raises(parser.ParserError, self.parser.parse, "+03:00.34")
pytest.raises(parser.ParserError, self.parser.parse, "+03:00 ")
pytest.raises(
parser.ParserError,
self.parser.parse,
"(UTC+01:00 Amsterdam, Berlin, Bern, Rom, Stockholm, Wien",
)
pytest.raises(
parser.ParserError,
self.parser.parse,
"+01:00 Amsterdam, Berlin, Bern, Rom, Stockholm, Wien",
)

# These get parsed by dateutil.tz.gettz(), albeit it probably shouldn't
# pytest.raises(parser.ParserError, self.parser.parse, "(UTC+01:00")
# pytest.raises(parser.ParserError, self.parser.parse, "(UTC+01:00 Amsterdam")


@pytest.mark.usefixtures("dt_parser")
Expand Down