Skip to content

Commit

Permalink
Merge pull request arrow-py#402 from crsmithdev/patch-fromtimestamp
Browse files Browse the repository at this point in the history
Fix for poperly handle tz passed in from pytz
  • Loading branch information
andrewelkins committed Dec 31, 2016
2 parents a7daa31 + 7f69ace commit 3379718
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arrow/arrow.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def fromtimestamp(cls, timestamp, tzinfo=None):
dt = datetime.fromtimestamp(timestamp, tzinfo)

return cls(dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second,
dt.microsecond, tzinfo)
dt.microsecond, dt.tzinfo)

@classmethod
def utcfromtimestamp(cls, timestamp):
Expand Down

0 comments on commit 3379718

Please sign in to comment.