fix lint errors

Author: whummer

localstack/services/apigateway/apigateway_listener.py

@@ -173,7 +173,7 @@ def forward_request(self, method, path, data, headers):
 
                     try:
                         path_params = extract_path_params(path=relative_path, extracted_path=extracted_path)
-                    except:
+                    except Exception:
                         path_params = {}
                     result = lambda_api.process_apigateway_invocation(func_arn, relative_path, data_str,
                         headers, path_params=path_params, method=method, resource_path=path)
@@ -186,7 +186,7 @@ def forward_request(self, method, path, data, headers):
                     try:
                         response_body = parsed_result['body']
                         response._content = json.dumps(response_body)
-                    except:
+                    except Exception:
                         response._content = '{}'
                     return response
                 else:

localstack/utils/common.py

@@ -377,7 +377,7 @@ def json_safe(item):
     """ return a copy of the given object (e.g., dict) that is safe for JSON dumping """
     try:
         return json.loads(json.dumps(item, cls=CustomEncoder))
-    except:
+    except Exception:
         item = fix_json_keys(item)
         return json.loads(json.dumps(item, cls=CustomEncoder))
 
@@ -517,12 +517,13 @@ def generate_ssl_cert(target_file=None, overwrite=False, random=False):
 
     # create a self-signed cert
     cert = crypto.X509()
-    cert.get_subject().C = 'AU'
-    cert.get_subject().ST = 'Some-State'
-    cert.get_subject().L = 'Some-Locality'
-    cert.get_subject().O = 'LocalStack Org'
-    cert.get_subject().OU = 'Testing'
-    cert.get_subject().CN = 'LocalStack'
+    subj = cert.get_subject()
+    subj.C = 'AU'
+    subj.ST = 'Some-State'
+    subj.L = 'Some-Locality'
+    subj.O = 'LocalStack Org'  # noqa
+    subj.OU = 'Testing'
+    subj.CN = 'LocalStack'
     cert.set_serial_number(1000)
     cert.gmtime_adj_notBefore(0)
     cert.gmtime_adj_notAfter(10 * 365 * 24 * 60 * 60)

localstack/utils/kinesis/kinesis_connector.py

@@ -160,13 +160,13 @@ def running(self):
 
     @classmethod
     def get_log_level_names(cls, min_level):
-        return [logging.getLevelName(l) for l in LOG_LEVELS if l >= min_level]
+        return [logging.getLevelName(lvl) for lvl in LOG_LEVELS if lvl >= min_level]
 
     def get_logger_for_level_in_log_line(self, line):
         level = self.log_level
-        for l in LOG_LEVELS:
-            if l >= level:
-                level_name = logging.getLevelName(l)
+        for lvl in LOG_LEVELS:
+            if lvl >= level:
+                level_name = logging.getLevelName(lvl)
                 if re.match(r'.*(%s):.*' % level_name, line):
                     return getattr(self.logger, level_name.lower())
         return None

requirements.txt

@@ -9,7 +9,7 @@ boto3==1.4.4
 coverage==4.0.3
 docopt==0.6.2
 elasticsearch==5.3.0
-flake8>=3.4.1
+flake8>=3.5.0
 flake8-quotes>=0.11.0
 flask==0.10.1
 flask-cors==3.0.3