From 13c1681502ac334dae8bed4faf43a31d39a6aa36 Mon Sep 17 00:00:00 2001 From: Martin Levy Date: Tue, 23 Aug 2022 16:01:07 -0700 Subject: [PATCH] more pylint fixes --- CloudFlare/exceptions.py | 2 ++ CloudFlare/network.py | 43 ++++++++++++++++---------------------- CloudFlare/read_configs.py | 26 +++++++++++------------ cli4/cli4.py | 6 +++--- cli4/converters.py | 20 +++++++++--------- pylintrc | 1 + 6 files changed, 47 insertions(+), 51 deletions(-) diff --git a/CloudFlare/exceptions.py b/CloudFlare/exceptions.py index 44d738b..f2ad4d7 100644 --- a/CloudFlare/exceptions.py +++ b/CloudFlare/exceptions.py @@ -25,6 +25,8 @@ def __init__(self, code, message, error_chain=None): self.error_chain.append( self.CodeMessage(int(evalue['code']), str(evalue['message']))) # self.error_chain.append({'code': self.code, 'message': str(self.message)}) + # As we are built off Exception, we need to get our superclass all squared away + # super().__init__(message) def __int__(self): """ integer value for Cloudflare API errors""" diff --git a/CloudFlare/network.py b/CloudFlare/network.py index 052ed79..08c63f0 100644 --- a/CloudFlare/network.py +++ b/CloudFlare/network.py @@ -5,7 +5,7 @@ from .exceptions import CloudFlareAPIError -class CFnetwork(object): +class CFnetwork(): """ Network for Cloudflare API""" def __init__(self, use_sessions=True): @@ -26,39 +26,32 @@ def __call__(self, method, url, headers=None, params=None, data=None, files=None method = method.upper() if method == 'GET': - return self.session.get(url, - headers=headers, params=params, data=data) - if method == 'POST': + r = self.session.get(url, headers=headers, params=params, data=data) + elif method == 'POST': if isinstance(data, str): - return self.session.post(url, - headers=headers, params=params, data=data, files=files) + r = self.session.post(url, headers=headers, params=params, data=data, files=files) else: - return self.session.post(url, - headers=headers, params=params, json=data, files=files) - if method == 'PUT': + r = self.session.post(url, headers=headers, params=params, json=data, files=files) + elif method == 'PUT': if isinstance(data, str): - return self.session.put(url, - headers=headers, params=params, data=data) + r = self.session.put(url, headers=headers, params=params, data=data) else: - return self.session.put(url, - headers=headers, params=params, json=data) - if method == 'DELETE': + r = self.session.put(url, headers=headers, params=params, json=data) + elif method == 'DELETE': if isinstance(data, str): - return self.session.delete(url, - headers=headers, params=params, data=data) + r = self.session.delete(url, headers=headers, params=params, data=data) else: - return self.session.delete(url, - headers=headers, params=params, json=data) - if method == 'PATCH': + r = self.session.delete(url, headers=headers, params=params, json=data) + elif method == 'PATCH': if isinstance(data, str): - return self.session.request('PATCH', url, - headers=headers, params=params, data=data) + r = self.session.request('PATCH', url, headers=headers, params=params, data=data) else: - return self.session.request('PATCH', url, - headers=headers, params=params, json=data) + r = self.session.request('PATCH', url, headers=headers, params=params, json=data) + else: + # should never happen + raise CloudFlareAPIError(0, 'method not supported') - # should never happen - raise CloudFlareAPIError(0, 'method not supported') + return r def __del__(self): """ Network for Cloudflare API""" diff --git a/CloudFlare/read_configs.py b/CloudFlare/read_configs.py index 0c4432f..b92ba5e 100644 --- a/CloudFlare/read_configs.py +++ b/CloudFlare/read_configs.py @@ -14,11 +14,11 @@ def read_configs(profile=None): config = {'email': None, 'token': None, 'certtoken': None, 'extras': None, 'base_url': None, 'profile': None} # envioronment variables override config files - so setup first - config['email'] = os.getenv('CLOUDFLARE_EMAIL') if os.getenv('CLOUDFLARE_EMAIL') != None else os.getenv('CF_API_EMAIL') - config['token'] = os.getenv('CLOUDFLARE_API_KEY') if os.getenv('CLOUDFLARE_API_KEY') != None else os.getenv('CF_API_KEY') - config['certtoken'] = os.getenv('CLOUDFLARE_API_CERTKEY') if os.getenv('CLOUDFLARE_API_CERTKEY') != None else os.getenv('CF_API_CERTKEY') - config['extras'] = os.getenv('CLOUDFLARE_API_EXTRAS') if os.getenv('CLOUDFLARE_API_EXTRAS') != None else os.getenv('CF_API_EXTRAS') - config['base_url'] = os.getenv('CLOUDFLARE_API_URL') if os.getenv('CLOUDFLARE_API_URL') != None else os.getenv('CF_API_URL') + config['email'] = os.getenv('CLOUDFLARE_EMAIL') if os.getenv('CLOUDFLARE_EMAIL') is not None else os.getenv('CF_API_EMAIL') + config['token'] = os.getenv('CLOUDFLARE_API_KEY') if os.getenv('CLOUDFLARE_API_KEY') is not None else os.getenv('CF_API_KEY') + config['certtoken'] = os.getenv('CLOUDFLARE_API_CERTKEY') if os.getenv('CLOUDFLARE_API_CERTKEY') is not None else os.getenv('CF_API_CERTKEY') + config['extras'] = os.getenv('CLOUDFLARE_API_EXTRAS') if os.getenv('CLOUDFLARE_API_EXTRAS') is not None else os.getenv('CF_API_EXTRAS') + config['base_url'] = os.getenv('CLOUDFLARE_API_URL') if os.getenv('CLOUDFLARE_API_URL') is not None else os.getenv('CF_API_URL') # grab values from config files cp = configparser.ConfigParser() @@ -28,10 +28,10 @@ def read_configs(profile=None): os.path.expanduser('~/.cloudflare.cfg'), os.path.expanduser('~/.cloudflare/cloudflare.cfg') ]) - except Exception as e: + except: raise Exception("%s: configuration file error" % (profile)) - if len(cp.sections()) == 0 and profile != None: + if len(cp.sections()) == 0 and profile is not None: # no config file and yet a config name provided - not acceptable! raise Exception("%s: configuration section provided however config file missing" % (profile)) @@ -43,7 +43,7 @@ def read_configs(profile=None): profile = 'Cloudflare' ## still not found - then set to to CloudFlare for legacy reasons - if profile == None: + if profile is None: profile = "CloudFlare" config['profile'] = profile @@ -61,11 +61,11 @@ def read_configs(profile=None): config[option] = re.sub(r"\s+", ' ', config_value) else: config[option] = re.sub(r"\s+", '', config_value) - if config[option] == None or config[option] == '': + if config[option] is None or config[option] == '': config.pop(option) except (configparser.NoOptionError, configparser.NoSectionError): pass - except Exception as e: + except: pass # do we have an override for specific calls? (i.e. token.post or email.get etc) @@ -74,11 +74,11 @@ def read_configs(profile=None): try: config_value = cp.get(profile, option_for_method) config[option_for_method] = re.sub(r"\s+", '', config_value) - if config[option] == None or config[option] == '': + if config[option] is None or config[option] == '': config.pop(option_for_method) - except (configparser.NoOptionError, configparser.NoSectionError) as e: + except (configparser.NoOptionError, configparser.NoSectionError): pass - except Exception as e: + except: pass # do any final cleanup - only needed for extras (which are multiline) diff --git a/cli4/cli4.py b/cli4/cli4.py index 790972c..172d5fd 100644 --- a/cli4/cli4.py +++ b/cli4/cli4.py @@ -203,10 +203,10 @@ def run_command(cf, method, command, params=None, content=None, files=None): # more than one error returned by the API for x in e: sys.stderr.write('cli4: /%s - %d %s\n' % (command, x, x)) - sys.stderr.write('cli4: /%s - %d %s\n' % (command, e, e)) + sys.stderr.write('cli4: /%s - %d %s\n' % (command, int(e), e)) raise e except CloudFlare.exceptions.CloudFlareInternalError as e: - sys.stderr.write('cli4: InternalError: /%s - %d %s\n' % (command, e, e)) + sys.stderr.write('cli4: InternalError: /%s - %d %s\n' % (command, int(e), e)) raise e except Exception as e: sys.stderr.write('cli4: /%s - %s - api error\n' % (command, e)) @@ -239,7 +239,7 @@ def write_results(results, output): sort_keys=True, ensure_ascii=False, encoding='utf8') - except TypeError as e: + except TypeError: results = json.dumps(results, indent=4, sort_keys=True, diff --git a/cli4/converters.py b/cli4/converters.py index 5653ed8..77c6b1a 100644 --- a/cli4/converters.py +++ b/cli4/converters.py @@ -12,7 +12,7 @@ def convert_zones_to_identifier(cf, zone_name): try: zones = cf.zones.get(params=params) except CloudFlare.exceptions.CloudFlareAPIError as e: - raise ConverterError(int(e), '%s - %d %s' % (zone_name, e, e)) + raise ConverterError(int(e), '%s - %d %s' % (zone_name, int(e), e)) except Exception as e: raise ConverterError(0, '%s - %s' % (zone_name, e)) @@ -27,7 +27,7 @@ def convert_accounts_to_identifier(cf, account_name): try: accounts = cf.accounts.get(params=params) except CloudFlare.exceptions.CloudFlareAPIError as e: - raise ConverterError(int(e), '%s - %d %s' % (account_name, e, e)) + raise ConverterError(int(e), '%s - %d %s' % (account_name, int(e), e)) except Exception as e: raise ConverterError(0, '%s - %s' % (account_name, e)) @@ -43,7 +43,7 @@ def convert_dns_record_to_identifier(cf, zone_id, dns_name): try: dns_records = cf.zones.dns_records.get(zone_id, params=params) except CloudFlare.exceptions.CloudFlareAPIError as e: - raise ConverterError(int(e), '%s - %d %s' % (dns_name, e, e)) + raise ConverterError(int(e), '%s - %d %s' % (dns_name, int(e), e)) except Exception as e: raise ConverterError(0, '%s - %s' % (dns_name, e)) @@ -61,7 +61,7 @@ def convert_certificates_to_identifier(cf, certificate_name): try: certificates = cf.certificates.get() except CloudFlare.exceptions.CloudFlareAPIError as e: - raise ConverterError(int(e), '%s - %d %s' % (certificate_name, e, e)) + raise ConverterError(int(e), '%s - %d %s' % (certificate_name, int(e), e)) except Exception as e: raise ConverterError(0, '%s - %s' % (certificate_name, e)) @@ -76,7 +76,7 @@ def convert_organizations_to_identifier(cf, organization_name): try: organizations = cf.user.organizations.get() except CloudFlare.exceptions.CloudFlareAPIError as e: - raise ConverterError(int(e), '%s - %d %s' % (organization_name, e, e)) + raise ConverterError(int(e), '%s - %d %s' % (organization_name, int(e), e)) except Exception as e: raise ConverterError(0, '%s - %s' % (organization_name, e)) @@ -91,7 +91,7 @@ def convert_invites_to_identifier(cf, invite_name): try: invites = cf.user.invites.get() except CloudFlare.exceptions.CloudFlareAPIError as e: - raise ConverterError(int(e), '%s - %d %s' % (invite_name, e, e)) + raise ConverterError(int(e), '%s - %d %s' % (invite_name, int(e), e)) except Exception as e: raise ConverterError(0, '%s - %s' % (invite_name, e)) @@ -106,7 +106,7 @@ def convert_virtual_dns_to_identifier(cf, virtual_dns_name): try: virtual_dnss = cf.user.virtual_dns.get() except CloudFlare.exceptions.CloudFlareAPIError as e: - raise ConverterError(int(e), '%s - %d %s' % (virtual_dns_name, e, e)) + raise ConverterError(int(e), '%s - %d %s' % (virtual_dns_name, int(e), e)) except Exception as e: raise ConverterError(0, '%s - %s' % (virtual_dns_name, e)) @@ -121,7 +121,7 @@ def convert_load_balancers_pool_to_identifier(cf, pool_name): try: pools = cf.user.load_balancers.pools.get() except CloudFlare.exceptions.CloudFlareAPIError as e: - raise ConverterError(int(e), '%s - %d %s' % (pool_name, e, e)) + raise ConverterError(int(e), '%s - %d %s' % (pool_name, int(e), e)) except Exception as e: raise ConverterError(0, '%s - %s' % (pool_name, e)) @@ -138,9 +138,9 @@ def convert_custom_hostnames_to_identifier(cf, zone_id, custom_hostname): try: custom_hostnames_records = cf.zones.custom_hostnames.get(zone_id, params=params) except CloudFlare.exceptions.CloudFlareAPIError as e: - raise ConverterError(int(e), '%s - %d %s' % (dns_name, e, e)) + raise ConverterError(int(e), '%s - %d %s' % (custom_hostname, int(e), e)) except Exception as e: - raise ConverterError(0, '%s - %s' % (dns_name, e)) + raise ConverterError(0, '%s - %s' % (custom_hostname, e)) r = [] for custom_hostnames_record in custom_hostnames_records: diff --git a/pylintrc b/pylintrc index ca7c819..c42aae0 100644 --- a/pylintrc +++ b/pylintrc @@ -35,6 +35,7 @@ max-args=12 max-statements=160 max-branches=70 max-locals=40 +max-nested-blocks=10 [FORMAT] max-line-length=200