Skip to content

Commit

Permalink
CLN: Use public method to capture UTC offsets (pandas-dev#22164)
Browse files Browse the repository at this point in the history
  • Loading branch information
mroeschke authored and dberenbaum committed Aug 3, 2018
1 parent c72e876 commit 071c165
Showing 1 changed file with 4 additions and 16 deletions.
20 changes: 4 additions & 16 deletions pandas/_libs/tslib.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -634,24 +634,12 @@ cpdef array_to_datetime(ndarray[object] values, errors='raise',

# If the dateutil parser returned tzinfo, capture it
# to check if all arguments have the same tzinfo
tz = py_dt.tzinfo
tz = py_dt.utcoffset()
if tz is not None:
seen_datetime_offset = 1
if tz == dateutil_utc():
# dateutil.tz.tzutc has no offset-like attribute
# Just add the 0 offset explicitly
out_tzoffset_vals.add(0)
elif tz == tzlocal():
# is comparison fails unlike other dateutil.tz
# objects. Also, dateutil.tz.tzlocal has no
# _offset attribute like tzoffset
offset_seconds = tz._dst_offset.total_seconds()
out_tzoffset_vals.add(offset_seconds)
else:
# dateutil.tz.tzoffset objects cannot be hashed
# store the total_seconds() instead
offset_seconds = tz._offset.total_seconds()
out_tzoffset_vals.add(offset_seconds)
# dateutil timezone objects cannot be hashed, so store
# the UTC offsets in seconds instead
out_tzoffset_vals.add(tz.total_seconds())
else:
# Add a marker for naive string, to track if we are
# parsing mixed naive and aware strings
Expand Down

0 comments on commit 071c165

Please sign in to comment.