Fixing orbit number queries.

viresclient/_client_swarm.py

@@ -4,7 +4,7 @@
 import os
 
 from ._wps.environment import JINJA2_ENVIRONMENT
-from ._wps import time_util
+from ._wps.time_util import parse_datetime
 from ._client import WPSInputs, ClientRequest
 from ._data_handling import ReturnedDataFile
 
@@ -737,8 +737,8 @@ def get_times_for_orbits(self, spacecraft, start_orbit, end_orbit):
         ).encode('UTF-8')
         response = self._wps_service.retrieve(request)
         responsedict = json.loads(response.decode('UTF-8'))
-        start_time = time_util.parse_datetime(responsedict['start_time'])
-        end_time = time_util.parse_datetime(responsedict['end_time'])
+        start_time = parse_datetime(responsedict['start_time'])
+        end_time = parse_datetime(responsedict['end_time'])
         return start_time, end_time
 
     def get_orbit_number(self, spacecraft, input_time):
@@ -753,6 +753,13 @@ def get_orbit_number(self, spacecraft, input_time):
             int: The current orbit number at the input_time
 
         """
+        try:
+            input_time = parse_datetime(input_time)
+        except TypeError:
+            raise TypeError(
+                "input_time must be datetime object or ISO-8601 "
+                "date/time string"
+            )
         # Change to spacecraft = "A" etc. for this request
         if spacecraft in ("Alpha", "Bravo", "Charlie"):
             spacecraft = spacecraft[0]
@@ -767,7 +774,7 @@ def get_orbit_number(self, spacecraft, input_time):
         request = request_inputs.as_xml(self._templatefiles['sync'])
         retdata = ReturnedDataFile(filetype="csv")
         response_handler = self._response_handler(
-            retdata.file, show_progress=False
+            retdata, show_progress=False
         )
         self._wps_service.retrieve(request, handler=response_handler)
         return retdata.as_dataframe()["OrbitNumber"][0]