Merge pull request #3 from alight-analytics/jf/applying-backoff-for-maven

Applying changes to master

Author: Jonathan Falkenstein

setup.py

@@ -26,9 +26,11 @@
 if sys.version_info[0] >= 3:
     # Python 3
     from urllib.request import urlopen
+    from urllib.error import HTTPError
 else:
     # Python 2
     from urllib2 import urlopen
+    from urllib2 import HTTPError
 
 #
 # This script modifies the basic setuptools by adding some functionality to the standard
@@ -52,7 +54,7 @@
 
 PACKAGE_NAME = 'amazon_kclpy'
 JAR_DIRECTORY = os.path.join(PACKAGE_NAME, 'jars')
-PACKAGE_VERSION = '2.0.2'
+PACKAGE_VERSION = '2.0.5'
 PYTHON_REQUIREMENTS = [
     'boto',
     # argparse is part of python2.7 but must be declared for python2.6
@@ -182,7 +184,6 @@ def download_file(self, url, dest):
         """
         Downloads a file at the url to the destination.
         """
-        print('Attempting to retrieve remote jar {url}'.format(url=url))
         try:
             response = self.make_request_with_backoff(url)
 
@@ -204,11 +205,14 @@ def download_files(self):
 
     def make_request_with_backoff(self, url):
         for attempt_number in range(MAX_URL_DOWNLOAD_ATTEMPTS):
-            response = urlopen(url)
-            if response.getcode() == 429:
-                sleep_time = 2 ** attempt_number
-                print('"429 Too Many Requests" response received. Sleeping {} seconds and trying again.'.format(sleep_time))
-                sleep(sleep_time)
+            print('Attempting to retrieve remote jar {url}'.format(url=url))
+            try:
+                return urlopen(url)
+            except HTTPError as e:
+                if e.code == 429:
+                    sleep_time = 2 ** attempt_number
+                    print('"429 Too Many Requests" response received. Sleeping {} seconds and trying again.'.format(sleep_time))
+                    sleep(sleep_time)
             else:
                 return response
         raise Exception('"429 Too Many Requests" responses received.')