flake8 findings

Author: Helene

source/confParser.py

@@ -44,6 +44,7 @@ def checkTLSsettings(args):
             return False, MSG['CertError']
     return True, ''
 
+
 def checkAPIsettings(args):
     if not args.get('apiKeyName') or not args.get('apiKeyValue'):
         return False, MSG['MissingParm']
@@ -153,7 +154,7 @@ class Password(argparse.Action):
     defaults = ConfigManager().defaults
 
     def __call__(self, parser, namespace, values, option_string):
-        if values is None and self.defaults.get('apiKeyValue', None) == None:
+        if values is None and self.defaults.get('apiKeyValue', None) is None:
             print('no valid apiKeyValue found in the config.ini')
             values = getpass.getpass()
 
@@ -176,8 +177,8 @@ def parse_cmd_args(argv):
     parser.add_argument('-t', '--tlsKeyPath', action="store", default=None, help='Directory path of tls privkey.pem and cert.pem file location (Required only for HTTPS port 8443)')
     parser.add_argument('-k', '--tlsKeyFile', action="store", default=None, help='Name of TLS key file, f.e.: privkey.pem (Required only for HTTPS port 8443)')
     parser.add_argument('-m', '--tlsCertFile', action="store", default=None, help='Name of TLS certificate file, f.e.: cert.pem (Required only for HTTPS port 8443)')
-    parser.add_argument('-n', '--apiKeyName',  action="store", default=None, help='Name of api key file (Default from config.ini: \'scale_grafana\')')
-    parser.add_argument('-v', '--apiKeyValue',  action=Password, nargs='?', dest='apiKeyValue', default=None, help='Enter your apiKey value:')
+    parser.add_argument('-n', '--apiKeyName', action="store", default=None, help='Name of api key file (Default from config.ini: \'scale_grafana\')')
+    parser.add_argument('-v', '--apiKeyValue', action=Password, nargs='?', dest='apiKeyValue', default=None, help='Enter your apiKey value:')
 
     args = parser.parse_args(argv)
     return args, ''

source/queryHandler/PerfmonRESTclient.py

@@ -29,19 +29,17 @@
     pass
 
 
-
 DEFAULT_HEADERS = {
-            "Accept": "application/json",
-            "Content-type": "application/json"
-        }
+                    "Accept": "application/json",
+                    "Content-type": "application/json"}
 
 
 def getAuthHandler(keyName, keyValue):
     if not isinstance(keyName, bytes):
         keyName = bytes(keyName, 'utf-8')
     if not isinstance(keyValue, bytes):
         keyValue = bytes(keyValue, 'utf-8')
-    return requests.auth.HTTPBasicAuth(keyName,keyValue)
+    return requests.auth.HTTPBasicAuth(keyName, keyValue)
 
 
 def createRequestDataObj(logger, method, endpoint, host, port, auth, headers=None, files=None, json=None, params=None, data=None, cookies=None, hooks=None):
@@ -56,16 +54,15 @@ def createRequestDataObj(logger, method, endpoint, host, port, auth, headers=Non
     url = f'https://{host}:{port}/sysmon/v1/{endpoint}'
     # Create the Request.
     req = requests.Request(method=method.upper(),
-        url=url,
-        headers=headers or DEFAULT_HEADERS,
-        files=files,
-        data=data or {},
-        json=json,
-        params=params or {},
-        auth=auth,
-        cookies=cookies,
-        hooks=hooks,
-        )
+                           url=url,
+                           headers=headers or DEFAULT_HEADERS,
+                           files=files,
+                           data=data or {},
+                           json=json,
+                           params=params or {},
+                           auth=auth,
+                           cookies=cookies,
+                           hooks=hooks,)
     logger.debug('createRequestDataObj __ created request')
     return req
 
@@ -78,7 +75,7 @@ class perfHTTPrequestHelper(object):
     """
 
     def __init__(self, logger, reqdata=None, session=None):
-        self.session = session or requests.Session() 
+        self.session = session or requests.Session()
         self.requestData = reqdata
         self.logger = logger
 

source/queryHandler/QueryHandler.py

@@ -21,21 +21,14 @@
 '''
 
 from collections import namedtuple, defaultdict
-from contextlib import closing
 import inspect
 from itertools import chain
 import json
 import operator
 import socket
-import sys
 import time
-import select
-
 from .PerfmonRESTclient import perfHTTPrequestHelper, createRequestDataObj, getAuthHandler
-try:
-    import SysmonLogger
-except Exception:
-    pass
+
 
 class PerfmonConnError(Exception):
     pass

source/zimonGrafanaIntf.py

@@ -25,7 +25,6 @@
 import re
 import logging.handlers
 import sys
-import socket
 import os
 
 from queryHandler.Query import Query
@@ -584,7 +583,7 @@ def main(argv):
     try:
         logger.info("%s", MSG['BridgeVersionInfo'].format(__version__))
         logger.details('zimonGrafanaItf invoked with parameters:\n %s', "\n".join("{}={}".format(k, v) for k, v in args.items()))
-        #logger.details('zimonGrafanaItf invoked with parameters:\n %s', "\n".join("{}={}".format(k, type(v)) for k, v in args.items()))
+        # logger.details('zimonGrafanaItf invoked with parameters:\n %s', "\n".join("{}={}".format(k, type(v)) for k, v in args.items()))
         mdHandler = MetadataHandler(logger, args.get('server'), args.get('serverPort'), args.get('apiKeyName'), args.get('apiKeyValue'))
     except (AttributeError, TypeError, ValueError) as e:
         logger.details('%s', MSG['IntError'].format(str(e)))