remove microsecond handling

Author: rcomer

cf_units/__init__.py

@@ -387,39 +387,6 @@ def date2num(date, unit, calendar):
     return unit_inst.date2num(date)
 
 
-def _discard_microsecond(date):
-    """
-    Return a date with the microsecond component discarded.
-
-    Works for scalars, sequences and numpy arrays. Returns a scalar
-    if input is a scalar, else returns a numpy array.
-
-    Args:
-
-    * date (datetime.datetime or cftime.datetime):
-        Date value/s
-
-    Returns:
-        datetime, or numpy.ndarray of datetime object.
-
-    """
-    dates = np.asarray(date)
-    shape = dates.shape
-    dates = dates.ravel()
-    # Create date objects of the same type returned by cftime.num2date()
-    # (either datetime.datetime or cftime.datetime), discarding the
-    # microseconds
-    dates = np.array(
-        [
-            d
-            and d.__class__(d.year, d.month, d.day, d.hour, d.minute, d.second)
-            for d in dates
-        ]
-    )
-    result = dates[0] if shape == () else dates.reshape(shape)
-    return result
-
-
 def num2date(
     time_value,
     unit,
@@ -552,47 +519,16 @@ def _num2date_to_nearest_second(
         datetime, or numpy.ndarray of datetime object.
 
     """
-    time_values = np.asanyarray(time_value)
-    shape = time_values.shape
-    time_values = time_values.ravel()
 
-    # We account for the edge case where the time is in seconds and has a
-    # half second: cftime.num2date() may produce a date that would round
-    # down.
-    #
-    # Note that this behaviour is different to the num2date function in version
-    # 1.1 and earlier of cftime that didn't have microsecond precision. In
-    # those versions, a half-second value would be rounded up or down
-    # arbitrarily. It is probably not possible to replicate that behaviour with
-    # later versions, if one wished to do so for the sake of consistency.
     cftime_unit = unit.cftime_unit
-    time_units = cftime_unit.split(" ")[0]
-    has_half_seconds = np.logical_and(
-        time_units == "seconds", time_values % 1.0 == 0.5
-    )
+
     num2date_kwargs = dict(
         units=cftime_unit,
         calendar=unit.calendar,
         only_use_cftime_datetimes=only_use_cftime_datetimes,
         only_use_python_datetimes=only_use_python_datetimes,
     )
-    dates = cftime.num2date(time_values, **num2date_kwargs)
-    # try:
-    #     # We can assume all or none of the dates have a microsecond attribute
-    #     microseconds = np.array([d.microsecond if d else 0 for d in dates])
-    # except AttributeError:
-    #     microseconds = 0
-    # round_mask = np.logical_or(has_half_seconds, microseconds != 0)
-    # ceil_mask = np.logical_or(has_half_seconds, microseconds >= 500000)
-    # if time_values[ceil_mask].size > 0:
-    #     useconds = Unit("second")
-    #     second_frac = useconds.convert(0.75, time_units)
-    #     dates[ceil_mask] = cftime.num2date(
-    #         time_values[ceil_mask] + second_frac, **num2date_kwargs
-    #     )
-    # dates[round_mask] = _discard_microsecond(dates[round_mask])
-    result = dates[0] if shape == () else dates.reshape(shape)
-    return result
+    return cftime.num2date(time_value, **num2date_kwargs)
 
 
 _CACHE = {}
@@ -1971,8 +1907,6 @@ def date2num(self, date):
             array([5.5, 6.5])
 
         """
-
-        # date = _discard_microsecond(date)
         return cftime.date2num(date, self.cftime_unit, self.calendar)
 
     def num2date(