Merge branch 'master' of ssh://software.ecmwf.int:7999/cds/cdsapi

1 files changed, 9 insertions, 2 deletions

diff --git a/cdsapi/api.py b/cdsapi/api.py
index 3f3be34..7488002 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')