Wrap in try/except

Scripts/downloader.py

@@ -45,52 +45,15 @@ class Downloader:
             sys.stdout.write("Downloaded {}\r".format(b_s))
 
     def get_string(self, url, progress = True):
-        response = urlopen(url)
-        CHUNK = 16 * 1024
-        bytes_so_far = 0
         try:
-            total_size = int(response.headers['Content-Length'])
+            response = urlopen(url)
-        except:
+            CHUNK = 16 * 1024
-            total_size = -1
+            bytes_so_far = 0
-        chunk_so_far = "".encode("utf-8")
+            try:
-        while True:
+                total_size = int(response.headers['Content-Length'])
-            chunk = response.read(CHUNK)
+            except:
-            bytes_so_far += len(chunk)
+                total_size = -1
-            if progress:
+            chunk_so_far = "".encode("utf-8")
-                self._progress_hook(response, bytes_so_far, total_size)
-            if not chunk:
-                break
-            chunk_so_far += chunk
-        return chunk_so_far.decode("utf-8")
-
-    def get_bytes(self, url, progress = True):
-        response = urlopen(url)
-        CHUNK = 16 * 1024
-        bytes_so_far = 0
-        try:
-            total_size = int(response.headers['Content-Length'])
-        except:
-            total_size = -1
-        chunk_so_far = "".encode("utf-8")
-        while True:
-            chunk = response.read(CHUNK)
-            bytes_so_far += len(chunk)
-            if progress:
-                self._progress_hook(response, bytes_so_far, total_size)
-            if not chunk:
-                break
-            chunk_so_far += chunk
-        return chunk_so_far
-
-    def stream_to_file(self, url, file, progress = True):
-        response = urlopen(url)
-        CHUNK = 16 * 1024
-        bytes_so_far = 0
-        try:
-            total_size = int(response.headers['Content-Length'])
-        except:
-            total_size = -1
-        with open(file, 'wb') as f:
             while True:
                 chunk = response.read(CHUNK)
                 bytes_so_far += len(chunk)
@@ -98,8 +61,54 @@ class Downloader:
                     self._progress_hook(response, bytes_so_far, total_size)
                 if not chunk:
                     break
-                f.write(chunk)
+                chunk_so_far += chunk
-        if os.path.exists(file):
+            return chunk_so_far.decode("utf-8")
-            return file
+        except:
-        else:
+            return None
+
+    def get_bytes(self, url, progress = True):
+        try:
+            response = urlopen(url)
+            CHUNK = 16 * 1024
+            bytes_so_far = 0
+            try:
+                total_size = int(response.headers['Content-Length'])
+            except:
+                total_size = -1
+            chunk_so_far = "".encode("utf-8")
+            while True:
+                chunk = response.read(CHUNK)
+                bytes_so_far += len(chunk)
+                if progress:
+                    self._progress_hook(response, bytes_so_far, total_size)
+                if not chunk:
+                    break
+                chunk_so_far += chunk
+            return chunk_so_far
+        except:
+            return None
+
+    def stream_to_file(self, url, file, progress = True):
+        try:
+            response = urlopen(url)
+            CHUNK = 16 * 1024
+            bytes_so_far = 0
+            try:
+                total_size = int(response.headers['Content-Length'])
+            except:
+                total_size = -1
+            with open(file, 'wb') as f:
+                while True:
+                    chunk = response.read(CHUNK)
+                    bytes_so_far += len(chunk)
+                    if progress:
+                        self._progress_hook(response, bytes_so_far, total_size)
+                    if not chunk:
+                        break
+                    f.write(chunk)
+            if os.path.exists(file):
+                return file
+            else:
+                return None
+        except:
             return None