Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 arrow/factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ def get(self, *args: Any, **kwargs: Any) -> Arrow:
arg_count = 3

# tzinfo kwarg is not provided
if len(kwargs) == 1 and tz is None:
if len(kwargs) == 1 and "tzinfo" not in kwargs:
arg_count = 3

# () -> now, @ tzinfo or utc
Expand Down
11 changes: 11 additions & 0 deletions tests/test_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,17 @@ def test_kwarg_tzinfo_string(self):
with pytest.raises(ParserError):
self.factory.get(tzinfo="US/PacificInvalidTzinfo")

def test_kwarg_tzinfo_none_with_string_and_format(self):
# Passing tzinfo=None explicitly, alongside a string and a format,
# should behave the same as not passing tzinfo at all (i.e. parse
# the string using the given format, defaulting to UTC), rather
# than being treated as a 3+ arg direct-constructor call.
result = self.factory.get("2013-01-01", "YYYY-MM-DD", tzinfo=None)
expected = self.factory.get("2013-01-01", "YYYY-MM-DD")

assert result._datetime == expected._datetime
assert result._datetime == datetime(2013, 1, 1, tzinfo=tz.tzutc())

def test_kwarg_normalize_whitespace(self):
result = self.factory.get(
"Jun 1 2005 1:33PM",
Expand Down
Loading