diff options
| author | Baudouin Raoult <baudouin.raoult@ecmwf.int> | 2018-05-09 15:44:34 +0100 |
|---|---|---|
| committer | Baudouin Raoult <baudouin.raoult@ecmwf.int> | 2018-05-09 15:44:34 +0100 |
| commit | 558f7a9f49cdc46d7a3b1b1f43e5f1cf2da5fa19 (patch) | |
| tree | d98af5127d6c46942bd4e4a0c2a25ece1c488d1a /cdsapi | |
| parent | 28ac54c3bdef69fb2c80c6ab56424a7f493f91d5 (diff) | |
api
Diffstat (limited to 'cdsapi')
| -rw-r--r-- | cdsapi/api.py | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/cdsapi/api.py b/cdsapi/api.py index 4c9f29a..8583b08 100644 --- a/cdsapi/api.py +++ b/cdsapi/api.py @@ -6,7 +6,7 @@ import os def bytes_to_string(n): - u = ['', 'Ki', 'Mi', 'Gi', 'Ti', 'Pi'] + u = ['', 'K', 'M', 'G', 'T', 'P'] i = 0 while n >= 1024: n /= 1024.0 @@ -131,10 +131,12 @@ class Client(object): if 'request_id' in reply: rid = reply['request_id'] - self._trace("DELETE %s" % (reply['location'],)) - metadata = session.delete(reply['location'], verify=self.verify) - self._trace("DELETE returns %s %s" % (metadata.status_code, metadata.reason)) - # metadata.raise_for_status() + + task_url = "%s/tasks/%s" % (self.end_point, rid) + self._trace("DELETE %s" % (task_url,)) + delete = session.delete(task_url, verify=self.verify) + self._trace("DELETE returns %s %s" % (delete.status_code, delete.reason)) + delete.raise_for_status() self._trace("Done") return @@ -151,7 +153,10 @@ class Client(object): if sleep > self.sleep_max: sleep = self.sleep_max - result = session.get("%s/tasks/%s" % (self.end_point, rid), verify=self.verify) + task_url = "%s/tasks/%s" % (self.end_point, rid) + self._trace("GET %s" % (task_url,)) + + result = session.get(task_url, verify=self.verify) result.raise_for_status() reply = result.json() continue |