Skip to content

Correct regex A-z typo #374

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

Merged
sdispater merged 6 commits into from
Jul 4, 2020
Merged

Correct regex A-z typo #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
647f0a0
Correct regex A-z typo
altendky May 13, 2019
8271a60
Remove unneeded lines from test
altendky May 13, 2019
01c1d84
Remove more unneeded...
altendky May 13, 2019
7d26a8f
Merge branch 'master' into 373-altendky-fix_match_timezone_capitaliza…
altendky Aug 10, 2019
7eb5638
Merge branch 'master' into 373-altendky-fix_match_timezone_capitaliza…
altendky Apr 11, 2020
a0f2bad
black
altendky Apr 11, 2020
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
2 changes: 1 addition & 1 deletion pendulum/formatting/formatter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+"
r"|[\u0600-\u06FF/]+(\s*?[\u0600-\u06FF]+){1,2}"
)
_MATCH_TIMEZONE = "[A-za-z0-9-+]+(/[A-Za-z0-9-+_]+)?"
_MATCH_TIMEZONE = "[A-Za-z0-9-+]+(/[A-Za-z0-9-+_]+)?"


class Formatter:
Expand Down
7 changes: 7 additions & 0 deletions tests/datetime/test_from_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ def test_from_format_with_timezone():
assert "Europe/London" == d.timezone_name


def test_from_format_with_square_bracket_in_timezone():
with pytest.raises(ValueError, match="^String does not match format"):
pendulum.from_format(
"1975-05-21 22:32:11 Eu[rope/London", "YYYY-MM-DD HH:mm:ss z",
)


def test_from_format_with_escaped_elements():
d = pendulum.from_format("1975-05-21T22:32:11+00:00", "YYYY-MM-DD[T]HH:mm:ssZ")
assert_datetime(d, 1975, 5, 21, 22, 32, 11)
Expand Down