Skip to content
Merged
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
8 changes: 4 additions & 4 deletions pendulum/pendulum.py
Original file line number Diff line number Diff line change
Expand Up @@ -273,11 +273,11 @@ def now(cls, tz=None):
return test_instance

if tz is None or tz == 'local':
dt = datetime.datetime.now()
dt = datetime.datetime.now(cls._local_timezone())
elif tz is UTC or tz == 'UTC':
dt = datetime.datetime.utcnow().replace(tzinfo=UTC)
dt = datetime.datetime.now(UTC)
else:
dt = datetime.datetime.utcnow().replace(tzinfo=UTC)
dt = datetime.datetime.now(UTC)
tz = cls._safe_create_datetime_zone(tz)
dt = tz.convert(dt)

Expand Down Expand Up @@ -358,7 +358,7 @@ def create(cls, year=None, month=None, day=None,
if cls.has_test_now():
now = cls.get_test_now().in_tz(tz)
else:
now = datetime.datetime.utcnow().replace(tzinfo=UTC)
now = datetime.datetime.now(UTC)
now = tz.convert(now)

if year is None:
Expand Down