README.md

@@ -32,8 +32,3 @@ Contributing
 ------------
 
 Contributions are welcome.
-
-Other
------
-
-Reference Implementation in Java: https://github.com/icann/czds-api-client-java

config.sample.json

@@ -1,7 +1,7 @@
 {
   "icann.account.username": "username@example.com",
   "icann.account.password": "Abcdef#12345678",
-  "authentication.base.url": "https://account-api.icann.org",
+  "authentication.base.url": "https://account-api-test.icann.org",
-  "czds.base.url": "https://czds-api.icann.org",
+  "czds.base.url": "https://czds-api-test.icann.org",
   "working.directory": "/where/zonefiles/will/be/saved"
 }

do_http_get.py

@@ -6,6 +6,6 @@ def do_get(url, access_token):
                       'Accept': 'application/json',
                       'Authorization': 'Bearer {0}'.format(access_token)}
 
-    response = requests.get(url, params=None, headers=bearer_headers, stream=True)
+    response = requests.get(url, params=None, headers=bearer_headers)
 
     return response

download.py

@@ -12,13 +12,9 @@ from do_http_get import do_get
 ##############################################################################################################
 
 try:
-    if 'CZDS_CONFIG' in os.environ:
+    config_file = open("config.json", "r")
-        config_data = os.environ['CZDS_CONFIG']
+    config = json.load(config_file)
-        config = json.loads(config_data)
+    config_file.close()
-    else:
-        config_file = open("config.json", "r")
-        config = json.load(config_file)
-        config_file.close()
 except:
     sys.stderr.write("Error loading config.json file.\n")
     exit(1)
@@ -30,7 +26,7 @@ authen_base_url = config['authentication.base.url']
 czds_base_url = config['czds.base.url']
 
 # This is optional. Default to current directory
-working_directory = config.get('working.directory', '.') # Default to current directory
+working_directory = config['working.directory']
 
 if not username:
     sys.stderr.write("'icann.account.username' parameter not found in the config.json file\n")
@@ -48,6 +44,10 @@ if not czds_base_url:
     sys.stderr.write("'czds.base.url' parameter not found in the config.json file\n")
     exit(1)
 
+if not working_directory:
+    # Default to current directory
+    working_directory = '.'
+
 
 
 ##############################################################################################################
@@ -109,7 +109,7 @@ def download_one_zone(url, output_directory):
     if status_code == 200:
         # Try to get the filename from the header
         _,option = cgi.parse_header(download_zone_response.headers['content-disposition'])
-        filename = option.get('filename')
+        filename = option['filename']
 
         # If could get a filename from the header, then makeup one like [tld].txt.gz
         if not filename: