Working on pep8

Author: absolutejam

sensu_plugin/handler.py

@@ -12,10 +12,11 @@
 import requests
 try:
     from urlparse import urlparse
-except:
+except ImportError:
     from urllib.parse import urlparse
 from utils import *
 
+
 class SensuHandler(object):
     def __init__(self):
         # Parse the stdin into a global event object
@@ -29,7 +30,7 @@ def __init__(self):
         # Filter (deprecated) and handle
         self.filter()
         self.handle()
-    
+
     def read_event(self, check_result):
         '''
         Convert the piped check result (json) into a global 'event' dict
@@ -52,31 +53,31 @@ def handle(self):
     def filter(self):
         '''
         Filters exit the proccess if the event should not be handled.
-        
         Filtering events is deprecated and will be removed in a future release.
         '''
 
         if self.deprecated_filtering_enabled():
-            print('warning: event filtering in sensu-plugin is deprecated, see http://bit.ly/sensu-plugin')
+            print('warning: event filtering in sensu-plugin is deprecated,' +
+                  'see http://bit.ly/sensu-plugin')
             self.filter_disabled()
             self.filter_silenced()
             self.filter_dependencies()
 
             if self.deprecated_occurrence_filtering_enabled():
-                print('warning: occurrence filtering in sensu-plugin is deprecated, see http://bit.ly/sensu-plugin')
+                print('warning: occurrence filtering in sensu-plugin is' +
+                      'deprecated, see http://bit.ly/sensu-plugin')
                 self.filter_repeated()
 
     def deprecated_filtering_enabled(self):
         '''
         Evaluates whether the event should be processed by any of the
         filter methods in this library. Defaults to true,
         i.e. deprecated filters are run by default.
-        
+
         returns bool
         '''
         return self.event['check'].get('enable_deprecated_filtering', False)
 
-
     def deprecated_occurrence_filtering_enabled(self):
         '''
         Evaluates whether the event should be processed by the
@@ -86,7 +87,8 @@ def deprecated_occurrence_filtering_enabled(self):
         returns bool
         '''
 
-        return self.event['check'].get('enable_deprecated_occurrence_filtering', False)
+        return self.event['check'].get(
+            'enable_deprecated_occurrence_filtering', False)
 
     def bail(self, msg):
         '''
@@ -99,27 +101,29 @@ def bail(self, msg):
 
     def get_api_settings(self):
         '''
-        Return a hash of API settings derived first from ENV['SENSU_API_URL'] if set,
-        then Sensu config `api` scope if configured, and finally falling back to
-        to ipv4 localhost address on default API port.
-        
+        Return a hash of API settings derived first from ENV['SENSU_API_URL']
+        if set, then Sensu config `api` scope if configured, and finally
+        falling back to to ipv4 localhost address on default API port.
+
         return dict
         '''
 
         SENSU_API_URL = os.environ.get('SENSU_API_URL')
         if SENSU_API_URL:
             uri = urlparse(SENSU_API_URL)
             self.api_settings = {
-               'host': '{0}//{1}'.format(uri.scheme,uri.hostname),
-               'port': uri.port,
-               'user': uri.username,
-               'password': uri.password
+                'host': '{0}//{1}'.format(uri.scheme, uri.hostname),
+                'port': uri.port,
+                'user': uri.username,
+                'password': uri.password
             }
         else:
-            self.api_settings = self.settings.get('api',{})
-            self.api_settings['host'] = self.api_settings.get('host', '127.0.0.1')
-            self.api_settings['port'] = self.api_settings.get('port', 4567)
-    
+            self.api_settings = self.settings.get('api', {})
+            self.api_settings['host'] = self.api_settings.get(
+                'host', '127.0.0.1')
+            self.api_settings['port'] = self.api_settings.get(
+                'port', 4567)
+
     # API requests
     def api_request(method, path, blk):
         if not hasattr(self, 'api_settings'):
@@ -129,7 +133,7 @@ def api_request(method, path, blk):
             _request = requests.get
         elif method.lower() == 'post':
             _request = requests.post
-      
+
         domain = self.api_settings['host']
         # TODO: http/https
         uri = 'http://{}:{}{}'.format(domain, self.api_settings['port'], path)
@@ -139,33 +143,37 @@ def api_request(method, path, blk):
             auth = ()
         req = _request(uri, auth=auth)
         return req
-       
+
     def stash_exists(self, path):
         return self.api_request('get', '/stash' + path).status_code == 200
 
     def event_exists(self, client, check):
-        return self.api_request('get', '/events/' + client + '/' + check).status_code == 200
+        return self.api_request('get',
+                                '/events/{}/{}'.format(client, check)
+                               ).status_code == 200
 
     # Filters
     def filter_disabled(self):
-        if self.event['check']['alert'] == False:
+        if self.event['check']['alert'] is False:
             bail('alert disabled')
 
     def filter_silenced(self):
         stashes = [
-            ('client', '/silence/' + self.event['client']['name']),
-            ('check', '/silence/' + self.event['client']['name'] + '/' + self.event['check']['name']),
-            ('check', '/silence/all/' + self.event['check']['name'])
+            ('client', '/silence/{}'.format(self.event['client']['name'])),
+            ('check', '/silence/{}/{}'.format(
+                self.event['client']['name'],
+                self.event['check']['name'])),
+            ('check', '/silence/all/{}'.format(self.event['check']['name']))
         ]
         for scope, path in stashes:
             if stash_exists(path):
                 bail(scope + ' alerts silenced')
             # TODO: Timeout for querying Sensu API?
-            #       More appropriate in the api_request method? 
+            #       More appropriate in the api_request method?
 
     def filter_dependencies(self):
         dependencies = self.event['check'].get('dependencies', None)
-        if dependencies == None or not isinstance(dependencies, list):
+        if dependencies is None or not isinstance(dependencies, list):
             return
         for dependency in self.event['check']['dependencies']:
             if len(str(dependency)) == 0:
@@ -174,38 +182,42 @@ def filter_dependencies(self):
             # If there's a dependency on a check from another client, then use
             # that client name, otherwise assume same client.
             if len(dependency_split) == 2:
-                client,check = dependency_split
+                client, check = dependency_split
             else:
                 client = self.event['client']['name']
                 check = dependency_split[0]
             if self.event_exists(client, check):
                 bail('check dependency event exists')
 
-
     def filter_repeated(self):
         defaults = {
             'occurrences': 1,
             'interval': 30,
             'refresh': 1800
         }
 
-        # Override defaults with anything defined in the settings 
+        # Override defaults with anything defined in the settings
         if isinstance(self.settings['sensu_plugin'], dict):
             defaults.update(settings['sensu_plugin'])
         end
 
-        occurrences = int(self.event['check'].get('occurrences', defaults['occurrences']))
-        interval = int(self.event['check'].get('interval', defaults['interval']))
-        refresh = int(self.event['check'].get('refresh', defaults['refresh']))
+        occurrences = int(self.event['check'].get(
+            'occurrences', defaults['occurrences']))
+        interval = int(self.event['check'].get(
+            'interval', defaults['interval']))
+        refresh = int(self.event['check'].get(
+            'refresh', defaults['refresh']))
 
         if self.event['occurrences'] < occurrences:
             bail('not enough occurrences')
-      
-        if self.event['occurrences'] > occurrences and self.event['action'] == 'create':
+
+        if (self.event['occurrences'] > occurrences and
+                self.event['action'] == 'create'):
             return
-        
+
         number = int(refresh / interval)
-        if (number == 0) or ((self.event['occurrences'] - occurrences) % number == 0):
+        if (number == 0 or
+                (self.event['occurrences'] - occurrences) % number == 0):
             return
 
         bail('only handling every ' + str(number) + ' occurrences')

sensu_plugin/utils/__init__.py

@@ -1,48 +1,53 @@
 import os
 import json
 
+
 def config_files():
-  SENSU_LOADED_TEMPFILE = os.environ.get('SENSU_LOADED_TEMPFILE')
-  SENSU_CONFIG_FILES = os.environ.get('SENSU_CONFIG_FILES')
-  if SENSU_LOADED_TEMPFILE and os.path.isfile(SENSU_LOADED_TEMPLATE):
-    with open(SENSU_LOADED_TEMPLATE, 'r') as template:
-      contents = template.read()
-      return contents.split(':')
-  elif SENSU_CONFIG_FILES:
-    return SENSU_CONFIG_FILES.split(':')
-  else:
-    files = ['/etc/sensu/config.json']
-    [files.append('/etc/sensu/conf.d/' + filename) for filename in os.listdir('/etc/sensu/conf.d') if os.path.splitext(filename)[1] == '.json']
-    return files
+    SENSU_LOADED_TEMPFILE = os.environ.get('SENSU_LOADED_TEMPFILE')
+    SENSU_CONFIG_FILES = os.environ.get('SENSU_CONFIG_FILES')
+    if SENSU_LOADED_TEMPFILE and os.path.isfile(SENSU_LOADED_TEMPLATE):
+        with open(SENSU_LOADED_TEMPLATE, 'r') as template:
+            contents = template.read()
+            return contents.split(':')
+    elif SENSU_CONFIG_FILES:
+        return SENSU_CONFIG_FILES.split(':')
+    else:
+        files = ['/etc/sensu/config.json']
+        [files.append('/etc/sensu/conf.d/{}'.format(filename))
+         for filename in os.listdir('/etc/sensu/conf.d')
+         if os.path.splitext(filename)[1] == '.json']
+        return files
+
 
 def get_settings():
-  settings = {}
-  for config_file in config_files():
-    config_contents = load_config(config_file)
-    if config_contents != None:
-      settings = deep_merge(settings, config_contents)
-  return settings 
+    settings = {}
+    for config_file in config_files():
+        config_contents = load_config(config_file)
+        if config_contents is not None:
+            settings = deep_merge(settings, config_contents)
+    return settings
+
 
 def load_config(filename):
-  try:
-    with open(filename, 'r') as config_file:
-      return json.loads(config_file.read())
-  except:
-    {}
+    try:
+        with open(filename, 'r') as config_file:
+            return json.loads(config_file.read())
+    except FileNotFoundError:
+        {}
 
-def deep_merge(dict_one, dict_two):
-  merged = dict_one.copy()
-  for key,value in dict_two.items():
-    # value is equivalent to dict_two[key]
-    if (key in dict_one and
-        isinstance(dict_one[key], dict) and
-        isinstance(value, dict)):
-      merged[key] = deep_merge(dict_one[key], value)
-    elif (key in dict_one and
-          isinstance(dict_one[key], list) and 
-          isinstance(value, list)):
-      merged[key] = list(set(dict_one[key] + value))
-    else:
-      merged[key] = value
-  return merged
 
+def deep_merge(dict_one, dict_two):
+    merged = dict_one.copy()
+    for key, value in dict_two.items():
+        # value is equivalent to dict_two[key]
+        if (key in dict_one and
+            isinstance(dict_one[key], dict) and
+                isinstance(value, dict)):
+            merged[key] = deep_merge(dict_one[key], value)
+        elif (key in dict_one and
+              isinstance(dict_one[key], list) and
+              isinstance(value, list)):
+            merged[key] = list(set(dict_one[key] + value))
+        else:
+            merged[key] = value
+    return merged