Merge pull request #20 from slaclab/client_fixes

Python 3 fixes and fixes to client

client/python/datacat/auth.py

@@ -21,7 +21,7 @@ def __init__(self, key_id, secret_key, header_name, signature_format, url=None):
         if url:
             self.resource_base_url = url
         self.key_id = str(key_id)
-        self.secret_key = base64.b64decode(str(secret_key))
+        self.secret_key = base64.b64decode(str(secret_key).encode())
         self.header_name = header_name
         self.sig_fmt = signature_format
 
@@ -34,8 +34,8 @@ def __call__(self, request):
 
     def get_signature(self, r):
         canonical_string = self.get_canonical_string(r.url, r.headers, r.method)
-        h = hmac.new(self.secret_key, canonical_string, digestmod=hashlib.sha1)
-        return base64.encodestring(h.digest()).strip()
+        h = hmac.new(self.secret_key, canonical_string.encode(), digestmod=hashlib.sha1)
+        return base64.encodestring(h.digest()).strip().decode()
 
     def get_canonical_string(self, url, headers, method):
         parsedurl = urlparse(url)

client/python/datacat/client.py

@@ -148,8 +148,7 @@ def mkloc(self, path, site, resource, versionId="current", **kwargs):
         :param kwargs: Additional location attributes
         :return: A representation of the dataset that was just created.
         """
-        # We piggy back off of build_dataset
-        location = {site: site, resource: resource}
+        location = dict(site=site, resource=resource)
         location.update(**kwargs)
         ds = build_dataset(location=location)
         resp = self.http_client.mkds(path, pack(ds), versionId=versionId)

client/python/datacat/http_client.py

@@ -59,7 +59,7 @@ def children(self, path, versionId=None, site=None, stat=None, offset=None, max_
         endpoint = "path"
         param_list = "offset:offset max_num:max stat:stat".split(" ")
         param_map = dict([tuple(i.split(":")) for i in param_list])
-        params = {param_map[k]: v for k, v in locals().items() if k in param_map and v is not None}
+        params = {param_map[k]: v for k, v in list(locals().items()) if k in param_map and v is not None}
         target = self._target(endpoint, path, versionId, site) + ";children"
         return self._req("get", target, params, **kwargs)
 
@@ -169,7 +169,7 @@ def search(self, target, versionId=None, site=None, query=None, sort=None, show=
         endpoint = "search"
         param_list = "query:filter sort:sort show:show offset:offset max_num:max".split(" ")
         param_map = dict([tuple(i.split(":")) for i in param_list])
-        params = {param_map[k]: v for k, v in locals().items() if k in param_map and v is not None}
+        params = {param_map[k]: v for k, v in list(locals().items()) if k in param_map and v is not None}
         return self._req("get", self._target(endpoint, target, versionId, site), params, **kwargs)
 
     def permissions(self, path, group=None):
@@ -215,7 +215,7 @@ def _log_request(self, request):
 
         _logger.debug("Request: %s %s" % (http_method, url))
         if headers:
-            for header in headers.items():
+            for header in list(headers.items()):
                 _logger.debug("Request Header: %s" % ": ".join(header))
 
         if data:
@@ -228,7 +228,7 @@ def _log_response(self, response):
         _logger.debug("Response: (%s)", response.status_code)
 
         if headers:
-            for header in headers.items():
+            for header in list(headers.items()):
                 _logger.debug("Response Header: %s" % ": ".join(header))
 
         if response.content: