Merge pull request #1571 from practicalswift/fix-blind-excepts

[Python] Fix blind "except:" statements

Author: practicalswift

benchmark/scripts/Benchmark_Driver

@@ -128,7 +128,7 @@ def log_results(log_directory, driver, formatted_output, swift_repo=None):
     """
     try:
         branch = get_current_git_branch(swift_repo)
-    except:
+    except (OSError, subprocess.CalledProcessError):
         branch = None
     timestamp = time.strftime("%Y%m%d%H%M%S", time.localtime())
     if branch:
@@ -138,7 +138,7 @@ def log_results(log_directory, driver, formatted_output, swift_repo=None):
     driver_name = os.path.basename(driver)
     try:
         os.makedirs(output_directory)
-    except:
+    except OSError:
         pass
     log_file = os.path.join(output_directory,
                             driver_name + '-' + timestamp + '.log')

benchmark/scripts/Benchmark_RuntimeLeaksRunner.in

@@ -77,7 +77,7 @@ class LeaksRunnerBenchmarkDriver(perf_test_driver.BenchmarkDriver):
                                  stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             p.wait()
             error_out = p.stderr.readlines()
-        except:
+        except OSError:
             print("Child Process Failed! (%s,%s)" % (data['path'], data['test_name']))
             return LeaksRunnerResult(test_name, True)
 
@@ -94,7 +94,7 @@ class LeaksRunnerBenchmarkDriver(perf_test_driver.BenchmarkDriver):
                 d['objc_count'] -= FUNC_TO_GLOBAL_COUNTS[data['test_name']]['objc_count']
 
             return LeaksRunnerResult(test_name, (d['objc_count'] + d['swift_count']) > 0)
-        except:
+        except (KeyError, ValueError):
             print "Failed parse output! (%s,%s)" % (data['path'], data['test_name'])
             return LeaksRunnerResult(test_name, True)
 

benchmark/scripts/compare_perf_tests.py

@@ -38,7 +38,7 @@
 def parse_int(word):
     try:
         return int(word)
-    except:
+    except ValueError:
         raise Exception("Expected integer value, not " + word)
 
 def get_scores(fname):

tools/SourceKit/bindings/python/sourcekitd/capi.py

@@ -47,7 +47,7 @@ def __init__(self, wrapped):
         self.wrapped = wrapped
         try:
             self.__doc__ = wrapped.__doc__
-        except:
+        except AttributeError:
             pass
 
     def __get__(self, instance, instance_type=None):

utils/submit-benchmark-results

@@ -64,7 +64,7 @@ def submit_results_to_server(results_data, submit_url):
     # The result is expected to be a JSON object.
     try:
         return json.loads(result_data)
-    except:
+    except ValueError:
         import traceback
         print("Unable to load result, not a valid JSON object.")
         print()