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
4 changes: 2 additions & 2 deletions arrow/factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ def get(self, *args: Any, **kwargs: Any) -> Arrow:
if len(kwargs) > 1:
arg_count = 3

# tzinfo kwarg is not provided
if len(kwargs) == 1 and tz is None:
# one non-tzinfo kwarg is provided, send to constructor
if len(kwargs) == 1 and "tzinfo" not in kwargs:
arg_count = 3

# () -> now, @ tzinfo or utc
Expand Down
16 changes: 16 additions & 0 deletions tests/test_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ def test_no_args(self):
self.factory.get(), datetime.now(timezone.utc).replace(tzinfo=timezone.utc)
)

def test_no_args_tzinfo_none(self):
assert_datetime_equality(
self.factory.get(tzinfo=None),
datetime.now(timezone.utc).replace(tzinfo=timezone.utc),
)

def test_timestamp_one_arg_no_arg(self):
no_arg = self.factory.get(1406430900).timestamp()
one_arg = self.factory.get("1406430900", "X").timestamp()
Expand Down Expand Up @@ -208,6 +214,11 @@ def test_one_arg_iso_str(self):

assert_datetime_equality(self.factory.get(dt.isoformat()), dt)

def test_one_arg_str_tzinfo_none(self):
result = self.factory.get("2013-01-01", tzinfo=None)

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

def test_one_arg_iso_calendar(self):
pairs = [
(datetime(2004, 1, 4), (2004, 1, 7)),
Expand Down Expand Up @@ -287,6 +298,11 @@ def test_two_args_str_str(self):

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

def test_two_args_str_str_tzinfo_none(self):
result = self.factory.get("2013-01-01", "YYYY-MM-DD", tzinfo=None)

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

def test_two_args_str_tzinfo(self):
result = self.factory.get("2013-01-01", tzinfo=ZoneInfo("US/Pacific"))

Expand Down
Loading