diff options
author | Baudouin Raoult <baudouin.raoult@ecmwf.int> | 2018-05-23 11:38:23 +0200 |
---|---|---|
committer | Baudouin Raoult <baudouin.raoult@ecmwf.int> | 2018-05-23 11:38:23 +0200 |
commit | e5f64100c9b99b3f5e7c9ac67cc636b2017cae1e (patch) | |
tree | eccf7a55d76e275f0d58bb1acb5ce23ac3aac56c /cdsapi/api.py | |
parent | f0dec00829450a612a74a9017290a437d34419f3 (diff) | |
parent | 7a9489b18b5f873b6cb3cf8ac5e6b6cf2d8b01d4 (diff) |
Merge branch 'master' of https://software.ecmwf.int/stash/scm/cds/cdsapi
Diffstat (limited to 'cdsapi/api.py')
-rw-r--r-- | cdsapi/api.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cdsapi/api.py b/cdsapi/api.py index 0ada51b..a53ebf0 100644 --- a/cdsapi/api.py +++ b/cdsapi/api.py @@ -6,12 +6,15 @@ # granted to it by virtue of its status as an intergovernmental organisation nor # does it submit to any jurisdiction. -import requests +from __future__ import absolute_import, division, print_function, unicode_literals + import json import time import os import logging +import requests + def bytes_to_string(n): u = ['', 'K', 'M', 'G', 'T', 'P'] @@ -45,8 +48,12 @@ class Client(object): config = {} with open(dotrc) as f: for l in f.readlines(): + try: k, v = l.strip().split(':', 1) - config[k] = v.strip() + if k in ['url', 'key']: + config[k] = v.strip() + except: + print('The file ~/.cdsapirc is badly formatted (remove extra lines not required)') url = config.get('url') key = config.get('key') |