Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
jswhit committed Jul 10, 2020
1 parent 980a0af commit 950fb5f
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions cftime/_cftime.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -239,16 +239,17 @@ def date2num(dates,units,calendar='standard'):
basedate.microsecond)
else:
use_python_datetime = False
# convert basedate to specified calendar
if not isinstance(basedate, DATE_TYPES[calendar]):
basedate = to_calendar_specific_datetime(basedate, calendar, False)
times = []; n = 0
for date in dates.flat:
# use python datetime if possible.
if use_python_datetime:
# remove time zone offset
if getattr(date, 'tzinfo',None) is not None:
date = date.replace(tzinfo=None) - date.utcoffset()
else: # convert basedate and date to same calendar specific cftime.datetime instance
if not isinstance(basedate, DATE_TYPES[calendar]):
basedate = to_calendar_specific_datetime(basedate, calendar, False)
else: # convert date to same calendar specific cftime.datetime instance
if not isinstance(date, DATE_TYPES[calendar]):
date = to_calendar_specific_datetime(date, calendar, False)
if ismasked and mask.flat[n]:
Expand Down

0 comments on commit 950fb5f

Please sign in to comment.