moved convertion to datetimes to the from_netcdf methods.

Author: ChrisBarker-NOAA

gridded/time.py

@@ -67,7 +67,7 @@ def parse_time_offset(unit_str):
     return offset_hours, name
 
 
-class Time:
+class Time(object):
 
     # Used to make a singleton with the constant_time class method.
     #  question: why not a ContantTime Class?
@@ -102,6 +102,13 @@ def __init__(self,
                Allows shifting entire time interval into future or past
         :type displacement: `datetime.timedelta`
         '''
+        # fixme: This should be happening in various from_netcdf methods.
+        # if isinstance(data, (nc4.Variable, nc4._netCDF4._Variable)):
+        #     if (hasattr(nc4, 'num2pydate')):
+        #         self.data = nc4.num2pydate(data[:], units=data.units)
+        #     else:
+        #         self.data = nc4.num2date(data[:], units=data.units, only_use_cftime_datetimes=False, only_use_python_datetimes=True)
+        # elif isinstance(data, Time):
         if isinstance(data, Time):
             self.data = data.data
         elif data is None:

gridded/variable.py

@@ -248,9 +248,13 @@ def from_netCDF(cls,
 
         if time is None:
             timevarname = Time.locate_time_var_from_var(data)
-            if timevarname is not None:
-                timevarname = ds[timevarname]
-            time = Time(data=timevarname,
+            if timevarname is None:
+                tdata = None
+            else:
+                timevar = ds[timevarname]
+                tdata = nc4.num2date(timevar[:], units=timevar.units, only_use_cftime_datetimes=False, only_use_python_datetimes=True)
+            # why isn't this using Time.from_netcdf? (currently doesn't support origin and displacement)
+            time = Time(data=tdata,
                         filename=data_file,
                         varname=timevarname,
                         origin=time_origin,
@@ -812,6 +816,7 @@ def _gen_varname(cls,
 
 
 class VectorVariable(object):
+    # Fixme: a lot of code duplication in here
 
     # Keys are component names ('u', 'v', etc) and values are the netCDF4 names.
     # eg {'u': ['u', 'U', 'eastward_sea_water_velocity']}
@@ -976,11 +981,16 @@ def from_netCDF(cls,
             name = cls.__name__ + '_' + str(cls._instance_count)
             cls._instance_count += 1
         data = ds[varnames[0]]
+
         if time is None:
             timevarname = Time.locate_time_var_from_var(data)
-            if timevarname is not None:
-                timevarname = ds[timevarname]
-            time = Time(data=timevarname,
+            if timevarname is None:
+                tdata = None
+            else:
+                timevar = ds[timevarname]
+                tdata = nc4.num2date(timevar[:], units=timevar.units, only_use_cftime_datetimes=False, only_use_python_datetimes=True)
+            # why isn't this using Time.from_netcdf? (currently doesn't support origin and displacement)
+            time = Time(data=tdata,
                         filename=data_file,
                         varname=timevarname,
                         origin=time_origin,