Python3 support

.travis.yml

@@ -4,7 +4,7 @@ cache:
   directories:
   - $HOME/virtualenv
 python:
-- 2.7
+- 3.7
 install:
 - pip install -r requirements.pip
 - pip install -r requirements-dev.pip

setup.py

@@ -15,16 +15,16 @@
 setup(
     name='uws-client',
     version=version,
-    url='http://github.com/aipescience/uws-client/',
-    download_url='http://github.com/aipescience/uws-client/archive/%s.tar.gz' % version,
+    url='http://github.com/aicardi-obspm/uws-client/',
+    download_url='http://github.com/aicardi-obspm/uws-client/archive/%s.tar.gz' % version,
     packages=find_packages(),
     license=u'Apache License (2.0)',
     author=u'Adrian M. Partl',
     author_email='adrian@partl.net',
     maintainer=u'AIP E-Science',
     maintainer_email=u'escience@aip.de',
     description=u'A command line client for IVOA UWS services, plus models for development',
-    long_description='This is a client for IVOA Virtual Observatroy UWS services. It can be used to access UWS services directly or through Basic Authentication. Please visit https://github.com/aipescience/uws-client/blob/master/README.md for how to use the software.',
+    long_description='This is a client for IVOA Virtual Observatroy UWS services. It can be used to access UWS services directly or through Basic Authentication. Please visit https://github.com/aicardi-obspm/uws-client/blob/master/README.md for how to use the software.',
     include_package_data=True,
     install_requires=install_requires,
     entry_points={

uws/UWS/__init__.py

@@ -8,4 +8,3 @@
 from . import connection
 from . import models
 from .errors import UWSError
-

uws/UWS/client.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
-from lxml.etree import XMLSyntaxError as XMLSyntaxError
+from lxml.etree import XMLSyntaxError
+import dateutil.parser
+import pytz
 
 #import connection as UWSConnection
 #import models
@@ -8,12 +10,9 @@
 from . import connection as UWSConnection
 from . import models
 from .errors import UWSError
-from datetime import datetime
-import dateutil.parser
-import pytz
 
 
-class Client(object):
+class Client:
     def __init__(self, url=None, user=None, password=None, connection=None):
         if connection:
             self.connection = connection
@@ -28,56 +27,61 @@ def get_job_list(self, filters=None):
 
         try:
             response = self.connection.get('', params)
-        except Exception as e:
+        except Exception as exc:
             # Do not try to make a second request without parameters here,
             # because cannot call self.connection.get() a second time and reusing the connection
             # without calling a getresponse() or close() or something beforehand.
             # (This would lead to a httplib CannotSendRequest() error!)
             # Let's just raise the error immediately.
-            raise UWSError(str(e))
+            raise UWSError(str(exc))
 
         raw = response.read()
 
         try:
             job_list = models.Jobs(raw)
-        except XMLSyntaxError as e:
-            raise UWSError("Malformatted response. Are you sure the host you specified is a IVOA UWS service?", raw)
-        except Exception as e:
-            raise e
+        except XMLSyntaxError as exc:
+            raise UWSError("Malformatted response. Are you sure the host you specified is a "
+                           "IVOA UWS service?", raw)
+        except Exception as exc:
+            raise exc
 
         return job_list
 
-    def _validate_and_parse_filters(self, filters):
+    @staticmethod
+    def _validate_and_parse_filters(filters):
         filters_copy = filters.copy()
         phases = filters_copy.pop('phases', None)
         after = filters_copy.pop('after', None)
         last = filters_copy.pop('last', None)
 
         if filters_copy:
-            raise UWSError("Unknown filter properties %s", filters_copy.keys())
+            raise UWSError(f"Unknown filter properties {filters_copy.keys()}")
 
         params = []
 
         if phases:
             for phase in phases:
                 if phase not in models.JobPhases.phases:
-                    raise UWSError("Unknown phase %s in filter", phase)
+                    raise UWSError(f"Unknown phase {phase} in filter")
                 params.append(("PHASE", phase))
 
         if after:
             # TODO: Allow to provide local time and convert here to UTC?
-            # TODO: We may encounter more troubles with microseconds, if ',' used instead of '.'(e.g. German systems)
+            # TODO: We may encounter more troubles with microseconds,
+            #       if ',' used instead of '.'(e.g. German systems)
 
             try:
                 date = dateutil.parser.parse(after)
                 # The day defaults to current day, not to '01', if no day is
                 # given (e.g. '2010-09'->'2010-09-06').
                 # Let's tell the user how the given value was interpreted:
                 if str(date) != str(after):
-                    print("Note: Changed value for keyword 'after' from '%s' to '%s'." % (after, str(date)))
+                    print(f"Note: Changed value for keyword 'after' from '{after}' "
+                          f"to '{str(date)}'.")
 
             except:
-                raise UWSError("Date time format could not be parsed, expecting UTC in ISO 8601:2004 format or compatible: %s" % (str(after)))
+                raise UWSError("Date time format could not be parsed, expecting UTC in "
+                               "ISO 8601:2004 format or compatible: %s" % (str(after)))
 
             # Convert from given time (with attached timezone information) to UTC time
             if date.utcoffset() is not None:
@@ -92,15 +96,16 @@ def _validate_and_parse_filters(self, filters):
             try:
                 last = int(last)
             except:
-                raise UWSError("Value for 'last' argument must be a positive integer: %s" % (str(last)))
+                raise UWSError(f"Value for 'last' argument must be a positive integer: {str(last)}")
 
             if last < 1:
-                raise UWSError("Value for 'last' argument must be a positive integer: %s" % (str(last)))
+                raise UWSError(f"Value for 'last' argument must be a positive integer: {str(last)}")
             params.append(("LAST", last))
 
         return params
 
-    def _validate_and_parse_wait(self, wait, phase=None):
+    @staticmethod
+    def _validate_and_parse_wait(wait, phase=None):
         # wait must be positive integer or -1
         if wait.isdigit() or wait == '-1':
             duration = int(wait)
@@ -111,120 +116,129 @@ def _validate_and_parse_wait(self, wait, phase=None):
 
         if phase:
             if phase not in models.JobPhases.active_phases:
-                raise UWSError("Given phase '%s' is not an active phase, 'wait' with this phase is not supported." % phase)
+                raise UWSError(f"Given phase '{phase}' is not an active phase, "
+                               "'wait' with this phase is not supported.")
             params.append(("PHASE", phase))
 
         return params
 
-    def get_job(self, id, wait=None, phase=None):
+    def get_job(self, jid, wait=None, phase=None):
         params = None
         if wait:
             params = self._validate_and_parse_wait(wait, phase)
 
         try:
-            response = self.connection.get(id, params)
-        except Exception as e:
+            response = self.connection.get(jid, params)
+        except Exception as exc:
             # Do not make a second request without params, throw error
             # immediately
-            raise UWSError(str(e))
+            raise UWSError(str(exc))
 
         raw = response.read()
         try:
             result = models.Job(raw)
-        except XMLSyntaxError as e:
-            raise UWSError("Malformatted response. Are you sure the host you specified is a IVOA UWS service?", raw)
-        except Exception as e:
-            raise e
+        except XMLSyntaxError as exc:
+            raise UWSError("Malformatted response. Are you sure the host you specified is a "
+                           "IVOA UWS service?", raw)
+        except Exception as exc:
+            raise exc
 
         return result
 
-    def get_phase(self, id):
+    def get_phase(self, jid):
         try:
-            response = self.connection.get(id + '/phase')
-        except Exception as e:
-            raise UWSError(str(e))
+            response = self.connection.get(jid + '/phase')
+        except Exception as exc:
+            raise UWSError(str(exc))
 
         raw = response.read()
-        result = raw
+        result = str(raw, 'utf-8')
 
         return result
 
-    def new_job(self, args={}):
+    def new_job(self, args=None):
+        args = args or {}
         try:
             response = self.connection.post('', args)
-        except Exception as e:
-            raise UWSError(str(e))
+        except Exception as exc:
+            raise UWSError(str(exc))
 
         raw = response.read()
         try:
             result = models.Job(raw)
-        except XMLSyntaxError as e:
-            raise UWSError("Malformatted response. Are you sure the host you specified is a IVOA UWS service?", raw)
-        except Exception as e:
-            raise
+        except XMLSyntaxError as exc:
+            raise UWSError("Malformatted response. Are you sure the host you specified is a "
+                           "IVOA UWS service?", raw)
+        except Exception as exc:
+            raise exc
 
         return result
 
-    def set_parameters_job(self, id, args={}):
+    def set_parameters_job(self, jid, args=None):
+        args = args or {}
         try:
-            response = self.connection.post(id, args)
-        except Exception as e:
-            raise UWSError(str(e))
+            response = self.connection.post(jid, args)
+        except Exception as exc:
+            raise UWSError(str(exc))
 
         raw = response.read()
         try:
             result = models.Job(raw)
-        except XMLSyntaxError as e:
-            raise UWSError("Malformatted response. Are you sure the host you specified is a IVOA UWS service?", raw)
-        except Exception as e:
-            raise e
+        except XMLSyntaxError as exc:
+            raise UWSError("Malformatted response. Are you sure the host you specified is a "
+                           "IVOA UWS service?", raw)
+        except Exception as exc:
+            raise exc
 
         return result
 
-    def run_job(self, id):
+    def run_job(self, jid):
         try:
-            response = self.connection.post(id + '/phase', {"PHASE": "RUN"})
-        except Exception as e:
-            raise UWSError(str(e))
+            response = self.connection.post(jid + '/phase', {"PHASE": "RUN"})
+        except Exception as exc:
+            raise UWSError(str(exc))
 
         raw = response.read()
         try:
             result = models.Job(raw)
-        except XMLSyntaxError as e:
-            raise UWSError("Malformatted response. Are you sure the host you specified is a IVOA UWS service?", raw)
-        except Exception as e:
-            raise e
+        except XMLSyntaxError as exc:
+            raise UWSError("Malformatted response. Are you sure the host you specified is a "
+                           "IVOA UWS service?", raw)
+        except Exception as exc:
+            raise exc
 
         return result
 
-    def abort_job(self, id):
+    def abort_job(self, jid):
         try:
-            response = self.connection.post(id, {"PHASE": "ABORT"})
-        except Exception as e:
-            raise UWSError(str(e))
+            response = self.connection.post(jid, {"PHASE": "ABORT"})
+        except Exception as exc:
+            raise UWSError(str(exc))
 
         raw = response.read()
         try:
             result = models.Job(raw)
-        except XMLSyntaxError as e:
-            raise UWSError("Malformatted response. Are you sure the host you specified is a IVOA UWS service?", raw)
-        except Exception as e:
-            raise e
+        except XMLSyntaxError as exc:
+            raise UWSError("Malformatted response. Are you sure the host you specified is a IVOA "
+                           "UWS service?", raw)
+        except Exception as exc:
+            raise exc
 
         return result
 
-    def delete_job(self, id):
+    def delete_job(self, jid):
         try:
-            response = self.connection.delete(id)
-        except Exception as e:
-            raise UWSError(str(e))
+            response = self.connection.delete(jid)
+        except Exception as exc:
+            raise UWSError(str(exc))
 
         raw = response.read()
         try:
             result = True
-        except XMLSyntaxError as e:
-            raise UWSError("Malformatted response. Are you sure the host you specified is a IVOA UWS service?", raw)
-        except Exception as e:
-            raise e
+        except XMLSyntaxError as exc:
+            raise UWSError("Malformatted response. Are you sure the host you specified is a IVOA "
+                           "UWS service?", raw)
+        except Exception as exc:
+            raise exc
 
         return result