From 5a9f29404d0a6bb2d9cc2fbe9581ae72126522b9 Mon Sep 17 00:00:00 2001 From: Alessandro Amici Date: Tue, 15 May 2018 20:43:25 +0200 Subject: Change logging API (shortens long lines). --- cdsapi/api.py | 58 +++++++++++++++++++++++++++++----------------------------- setup.cfg | 2 +- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/cdsapi/api.py b/cdsapi/api.py index 40512de..a51d2d5 100644 --- a/cdsapi/api.py +++ b/cdsapi/api.py @@ -65,16 +65,16 @@ class Client(object): self.full_stack = full_stack self.delete = delete - self.logger.debug("CDSAPI %s" % dict(end_point=self.end_point, - api_key=self.api_key, - verbose=self.verbose, - verify=self.verify, - timeout=self.timeout, - sleep_max=self.sleep_max, - retry_max=self.retry_max, - full_stack=self.full_stack, - delete=self.delete - )) + self.logger.debug("CDSAPI %s", dict(end_point=self.end_point, + api_key=self.api_key, + verbose=self.verbose, + verify=self.verify, + timeout=self.timeout, + sleep_max=self.sleep_max, + retry_max=self.retry_max, + full_stack=self.full_stack, + delete=self.delete + )) def retrieve(self, name, request, target=None): self._api('%s/resources/%s' % (self.end_point, name), request, target) @@ -84,7 +84,7 @@ class Client(object): if local_filename is None: local_filename = url.split('/')[-1] - self.logger.debug('Downloading %s to %s (%s)' % (url, local_filename, bytes_to_string(size))) + self.logger.debug("Downloading %s to %s (%s)", url, local_filename, bytes_to_string(size)) start = time.time() r = self.robust(requests.get)(url, stream=True, verify=self.verify) total = 0 @@ -98,7 +98,7 @@ class Client(object): elapsed = time.time() - start if elapsed: - self.logger.debug('Download rate %s/s' % (bytes_to_string(size / elapsed))) + self.logger.debug("Download rate %s/s", bytes_to_string(size / elapsed)) return local_filename def _api(self, url, request, target): @@ -106,7 +106,7 @@ class Client(object): session = requests.Session() session.auth = tuple(self.api_key.split(':', 2)) - self.logger.debug('POST %s %s' % (url, json.dumps(request))) + self.logger.debug("POST %s %s, url", json.dumps(request)) result = self.robust(session.post)(url, json=request, verify=self.verify) reply = None @@ -129,8 +129,8 @@ class Client(object): if 'context' in reply and 'required_terms' in reply['context']: e = [error] for t in reply['context']['required_terms']: - e.append("To access this resource, you first need to accept the terms of '%s' at %s" % - (t['title'], t['url'])) + e.append("To access this resource, you first need to accept the terms" + "of '%s' at %s" % (t['title'], t['url'])) error = '. '.join(e) raise Exception(error) else: @@ -148,7 +148,7 @@ class Client(object): if target: self._download(reply['location'], int(reply['content_length']), target) else: - self.logger.debug('HEAD %s' % (reply['location'],)) + self.logger.debug("HEAD %s", reply['location']) metadata = self.robust(session.head)(reply['location'], verify=self.verify) metadata.raise_for_status() self.logger.debug(metadata.headers) @@ -158,16 +158,16 @@ class Client(object): if self.delete: task_url = '%s/tasks/%s' % (self.end_point, rid) - self.logger.debug('DELETE %s' % (task_url,)) + self.logger.debug("DELETE %s", task_url) delete = session.delete(task_url, verify=self.verify) - self.logger.debug('DELETE returns %s %s' % (delete.status_code, delete.reason)) + self.logger.debug("DELETE returns %s %s", delete.status_code, delete.reason) try: delete.raise_for_status() except Exception: - self.logger.warning('DELETE %s returns %s %s' % - (task_url, delete.status_code, delete.reason)) + self.logger.warning("DELETE %s returns %s %s", + task_url, delete.status_code, delete.reason) - self.logger.debug('Done') + self.logger.debug("Done") return if reply['state'] in ('queued', 'running'): @@ -176,14 +176,14 @@ class Client(object): if self.timeout and (time.time() - start > self.timeout): raise Exception('TIMEOUT') - self.logger.debug('Request ID is %s, sleep %s' % (rid, sleep)) + self.logger.debug("Request ID is %s, sleep %s", rid, sleep) time.sleep(sleep) sleep *= 1.5 if sleep > self.sleep_max: sleep = self.sleep_max task_url = '%s/tasks/%s' % (self.end_point, rid) - self.logger.debug('GET %s' % (task_url,)) + self.logger.debug("GET %s", task_url) result = self.robust(session.get)(task_url, verify=self.verify) result.raise_for_status() @@ -191,12 +191,12 @@ class Client(object): continue if reply['state'] in ('failed',): - self.logger.error('Message: %s' % (reply['error'].get('message'),)) - self.logger.error('Reason: %s' % (reply['error'].get('reason'),)) + self.logger.error("Message: %s", reply['error'].get('message')) + self.logger.error("Reason: %s", reply['error'].get('reason')) for n in reply.get('error', {}).get('context', {}).get('traceback', '').split('\n'): if n.strip() == '' and not self.full_stack: break - self.logger.error(' %s' % (n,)) + self.logger.error(" %s", n) raise Exception(reply['error'].get('reason')) raise Exception('Unknown API state [%s]' % (reply['state'],)) @@ -224,9 +224,9 @@ class Client(object): tries += 1 - self.logger.warning("Recovering from HTTP error [%s %s], attemps %s of %s" % ( - r.status_code, r.reason, tries, self.retry_max)) - self.logger.warning("Retrying in %s second (" % (self.sleep_max)) + self.logger.warning("Recovering from HTTP error [%s %s], attemps %s of %s", + r.status_code, r.reason, tries, self.retry_max) + self.logger.warning("Retrying in %s second (", self.sleep_max) time.sleep(self.sleep_max) return wrapped diff --git a/setup.cfg b/setup.cfg index f80683d..64fb455 100644 --- a/setup.cfg +++ b/setup.cfg @@ -10,7 +10,7 @@ norecursedirs = dist .tox .eggs -pep8maxlinelength = 99 +pep8maxlinelength = 109 mccabe-complexity = 10 [coverage:run] -- cgit v1.2.3 From 0c813c92e88242a9c706b785a84f548cc8d37f4b Mon Sep 17 00:00:00 2001 From: Alessandro Amici Date: Tue, 15 May 2018 21:00:04 +0200 Subject: Bugfix: fix format bug just introduced. --- cdsapi/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdsapi/api.py b/cdsapi/api.py index a51d2d5..d9db791 100644 --- a/cdsapi/api.py +++ b/cdsapi/api.py @@ -106,7 +106,7 @@ class Client(object): session = requests.Session() session.auth = tuple(self.api_key.split(':', 2)) - self.logger.debug("POST %s %s, url", json.dumps(request)) + self.logger.debug("POST %s, %s", url, json.dumps(request)) result = self.robust(session.post)(url, json=request, verify=self.verify) reply = None -- cgit v1.2.3 From 44042c7c27737c9dfc4fe15f497eae4294a938bb Mon Sep 17 00:00:00 2001 From: Alessandro Amici Date: Tue, 15 May 2018 21:00:50 +0200 Subject: Add python2 to CI testing. Light testing passes without code change. --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index ecf8e1a..612a790 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = qc, py36, py35, py34, deps +envlist = qc, py36, py35, py34, py27, deps [testenv] setenv = PYTHONPATH = {toxinidir} -- cgit v1.2.3