Skip to content
This repository was archived by the owner on Nov 22, 2024. It is now read-only.

Commit 13c1681

Browse files
mahtinmahtin
committed
more pylint fixes
1 parent 68f3f2f commit 13c1681

6 files changed

Lines changed: 47 additions & 51 deletions

File tree

‎CloudFlare/exceptions.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ def __init__(self, code, message, error_chain=None):
2525
self.error_chain.append(
2626
self.CodeMessage(int(evalue['code']), str(evalue['message'])))
2727
# self.error_chain.append({'code': self.code, 'message': str(self.message)})
28+
# As we are built off Exception, we need to get our superclass all squared away
29+
# super().__init__(message)
2830

2931
def __int__(self):
3032
""" integer value for Cloudflare API errors"""

‎CloudFlare/network.py‎

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from .exceptions import CloudFlareAPIError
77

8-
class CFnetwork(object):
8+
class CFnetwork():
99
""" Network for Cloudflare API"""
1010

1111
def __init__(self, use_sessions=True):
@@ -26,39 +26,32 @@ def __call__(self, method, url, headers=None, params=None, data=None, files=None
2626
method = method.upper()
2727

2828
if method == 'GET':
29-
return self.session.get(url,
30-
headers=headers, params=params, data=data)
31-
if method == 'POST':
29+
r = self.session.get(url, headers=headers, params=params, data=data)
30+
elif method == 'POST':
3231
if isinstance(data, str):
33-
return self.session.post(url,
34-
headers=headers, params=params, data=data, files=files)
32+
r = self.session.post(url, headers=headers, params=params, data=data, files=files)
3533
else:
36-
return self.session.post(url,
37-
headers=headers, params=params, json=data, files=files)
38-
if method == 'PUT':
34+
r = self.session.post(url, headers=headers, params=params, json=data, files=files)
35+
elif method == 'PUT':
3936
if isinstance(data, str):
40-
return self.session.put(url,
41-
headers=headers, params=params, data=data)
37+
r = self.session.put(url, headers=headers, params=params, data=data)
4238
else:
43-
return self.session.put(url,
44-
headers=headers, params=params, json=data)
45-
if method == 'DELETE':
39+
r = self.session.put(url, headers=headers, params=params, json=data)
40+
elif method == 'DELETE':
4641
if isinstance(data, str):
47-
return self.session.delete(url,
48-
headers=headers, params=params, data=data)
42+
r = self.session.delete(url, headers=headers, params=params, data=data)
4943
else:
50-
return self.session.delete(url,
51-
headers=headers, params=params, json=data)
52-
if method == 'PATCH':
44+
r = self.session.delete(url, headers=headers, params=params, json=data)
45+
elif method == 'PATCH':
5346
if isinstance(data, str):
54-
return self.session.request('PATCH', url,
55-
headers=headers, params=params, data=data)
47+
r = self.session.request('PATCH', url, headers=headers, params=params, data=data)
5648
else:
57-
return self.session.request('PATCH', url,
58-
headers=headers, params=params, json=data)
49+
r = self.session.request('PATCH', url, headers=headers, params=params, json=data)
50+
else:
51+
# should never happen
52+
raise CloudFlareAPIError(0, 'method not supported')
5953

60-
# should never happen
61-
raise CloudFlareAPIError(0, 'method not supported')
54+
return r
6255

6356
def __del__(self):
6457
""" Network for Cloudflare API"""

‎CloudFlare/read_configs.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ def read_configs(profile=None):
1414
config = {'email': None, 'token': None, 'certtoken': None, 'extras': None, 'base_url': None, 'profile': None}
1515

1616
# envioronment variables override config files - so setup first
17-
config['email'] = os.getenv('CLOUDFLARE_EMAIL') if os.getenv('CLOUDFLARE_EMAIL') != None else os.getenv('CF_API_EMAIL')
18-
config['token'] = os.getenv('CLOUDFLARE_API_KEY') if os.getenv('CLOUDFLARE_API_KEY') != None else os.getenv('CF_API_KEY')
19-
config['certtoken'] = os.getenv('CLOUDFLARE_API_CERTKEY') if os.getenv('CLOUDFLARE_API_CERTKEY') != None else os.getenv('CF_API_CERTKEY')
20-
config['extras'] = os.getenv('CLOUDFLARE_API_EXTRAS') if os.getenv('CLOUDFLARE_API_EXTRAS') != None else os.getenv('CF_API_EXTRAS')
21-
config['base_url'] = os.getenv('CLOUDFLARE_API_URL') if os.getenv('CLOUDFLARE_API_URL') != None else os.getenv('CF_API_URL')
17+
config['email'] = os.getenv('CLOUDFLARE_EMAIL') if os.getenv('CLOUDFLARE_EMAIL') is not None else os.getenv('CF_API_EMAIL')
18+
config['token'] = os.getenv('CLOUDFLARE_API_KEY') if os.getenv('CLOUDFLARE_API_KEY') is not None else os.getenv('CF_API_KEY')
19+
config['certtoken'] = os.getenv('CLOUDFLARE_API_CERTKEY') if os.getenv('CLOUDFLARE_API_CERTKEY') is not None else os.getenv('CF_API_CERTKEY')
20+
config['extras'] = os.getenv('CLOUDFLARE_API_EXTRAS') if os.getenv('CLOUDFLARE_API_EXTRAS') is not None else os.getenv('CF_API_EXTRAS')
21+
config['base_url'] = os.getenv('CLOUDFLARE_API_URL') if os.getenv('CLOUDFLARE_API_URL') is not None else os.getenv('CF_API_URL')
2222

2323
# grab values from config files
2424
cp = configparser.ConfigParser()
@@ -28,10 +28,10 @@ def read_configs(profile=None):
2828
os.path.expanduser('~/.cloudflare.cfg'),
2929
os.path.expanduser('~/.cloudflare/cloudflare.cfg')
3030
])
31-
except Exception as e:
31+
except:
3232
raise Exception("%s: configuration file error" % (profile))
3333

34-
if len(cp.sections()) == 0 and profile != None:
34+
if len(cp.sections()) == 0 and profile is not None:
3535
# no config file and yet a config name provided - not acceptable!
3636
raise Exception("%s: configuration section provided however config file missing" % (profile))
3737

@@ -43,7 +43,7 @@ def read_configs(profile=None):
4343
profile = 'Cloudflare'
4444

4545
## still not found - then set to to CloudFlare for legacy reasons
46-
if profile == None:
46+
if profile is None:
4747
profile = "CloudFlare"
4848

4949
config['profile'] = profile
@@ -61,11 +61,11 @@ def read_configs(profile=None):
6161
config[option] = re.sub(r"\s+", ' ', config_value)
6262
else:
6363
config[option] = re.sub(r"\s+", '', config_value)
64-
if config[option] == None or config[option] == '':
64+
if config[option] is None or config[option] == '':
6565
config.pop(option)
6666
except (configparser.NoOptionError, configparser.NoSectionError):
6767
pass
68-
except Exception as e:
68+
except:
6969
pass
7070

7171
# 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):
7474
try:
7575
config_value = cp.get(profile, option_for_method)
7676
config[option_for_method] = re.sub(r"\s+", '', config_value)
77-
if config[option] == None or config[option] == '':
77+
if config[option] is None or config[option] == '':
7878
config.pop(option_for_method)
79-
except (configparser.NoOptionError, configparser.NoSectionError) as e:
79+
except (configparser.NoOptionError, configparser.NoSectionError):
8080
pass
81-
except Exception as e:
81+
except:
8282
pass
8383

8484
# do any final cleanup - only needed for extras (which are multiline)

‎cli4/cli4.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,10 @@ def run_command(cf, method, command, params=None, content=None, files=None):
203203
# more than one error returned by the API
204204
for x in e:
205205
sys.stderr.write('cli4: /%s - %d %s\n' % (command, x, x))
206-
sys.stderr.write('cli4: /%s - %d %s\n' % (command, e, e))
206+
sys.stderr.write('cli4: /%s - %d %s\n' % (command, int(e), e))
207207
raise e
208208
except CloudFlare.exceptions.CloudFlareInternalError as e:
209-
sys.stderr.write('cli4: InternalError: /%s - %d %s\n' % (command, e, e))
209+
sys.stderr.write('cli4: InternalError: /%s - %d %s\n' % (command, int(e), e))
210210
raise e
211211
except Exception as e:
212212
sys.stderr.write('cli4: /%s - %s - api error\n' % (command, e))
@@ -239,7 +239,7 @@ def write_results(results, output):
239239
sort_keys=True,
240240
ensure_ascii=False,
241241
encoding='utf8')
242-
except TypeError as e:
242+
except TypeError:
243243
results = json.dumps(results,
244244
indent=4,
245245
sort_keys=True,

‎cli4/converters.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def convert_zones_to_identifier(cf, zone_name):
1212
try:
1313
zones = cf.zones.get(params=params)
1414
except CloudFlare.exceptions.CloudFlareAPIError as e:
15-
raise ConverterError(int(e), '%s - %d %s' % (zone_name, e, e))
15+
raise ConverterError(int(e), '%s - %d %s' % (zone_name, int(e), e))
1616
except Exception as e:
1717
raise ConverterError(0, '%s - %s' % (zone_name, e))
1818

@@ -27,7 +27,7 @@ def convert_accounts_to_identifier(cf, account_name):
2727
try:
2828
accounts = cf.accounts.get(params=params)
2929
except CloudFlare.exceptions.CloudFlareAPIError as e:
30-
raise ConverterError(int(e), '%s - %d %s' % (account_name, e, e))
30+
raise ConverterError(int(e), '%s - %d %s' % (account_name, int(e), e))
3131
except Exception as e:
3232
raise ConverterError(0, '%s - %s' % (account_name, e))
3333

@@ -43,7 +43,7 @@ def convert_dns_record_to_identifier(cf, zone_id, dns_name):
4343
try:
4444
dns_records = cf.zones.dns_records.get(zone_id, params=params)
4545
except CloudFlare.exceptions.CloudFlareAPIError as e:
46-
raise ConverterError(int(e), '%s - %d %s' % (dns_name, e, e))
46+
raise ConverterError(int(e), '%s - %d %s' % (dns_name, int(e), e))
4747
except Exception as e:
4848
raise ConverterError(0, '%s - %s' % (dns_name, e))
4949

@@ -61,7 +61,7 @@ def convert_certificates_to_identifier(cf, certificate_name):
6161
try:
6262
certificates = cf.certificates.get()
6363
except CloudFlare.exceptions.CloudFlareAPIError as e:
64-
raise ConverterError(int(e), '%s - %d %s' % (certificate_name, e, e))
64+
raise ConverterError(int(e), '%s - %d %s' % (certificate_name, int(e), e))
6565
except Exception as e:
6666
raise ConverterError(0, '%s - %s' % (certificate_name, e))
6767

@@ -76,7 +76,7 @@ def convert_organizations_to_identifier(cf, organization_name):
7676
try:
7777
organizations = cf.user.organizations.get()
7878
except CloudFlare.exceptions.CloudFlareAPIError as e:
79-
raise ConverterError(int(e), '%s - %d %s' % (organization_name, e, e))
79+
raise ConverterError(int(e), '%s - %d %s' % (organization_name, int(e), e))
8080
except Exception as e:
8181
raise ConverterError(0, '%s - %s' % (organization_name, e))
8282

@@ -91,7 +91,7 @@ def convert_invites_to_identifier(cf, invite_name):
9191
try:
9292
invites = cf.user.invites.get()
9393
except CloudFlare.exceptions.CloudFlareAPIError as e:
94-
raise ConverterError(int(e), '%s - %d %s' % (invite_name, e, e))
94+
raise ConverterError(int(e), '%s - %d %s' % (invite_name, int(e), e))
9595
except Exception as e:
9696
raise ConverterError(0, '%s - %s' % (invite_name, e))
9797

@@ -106,7 +106,7 @@ def convert_virtual_dns_to_identifier(cf, virtual_dns_name):
106106
try:
107107
virtual_dnss = cf.user.virtual_dns.get()
108108
except CloudFlare.exceptions.CloudFlareAPIError as e:
109-
raise ConverterError(int(e), '%s - %d %s' % (virtual_dns_name, e, e))
109+
raise ConverterError(int(e), '%s - %d %s' % (virtual_dns_name, int(e), e))
110110
except Exception as e:
111111
raise ConverterError(0, '%s - %s' % (virtual_dns_name, e))
112112

@@ -121,7 +121,7 @@ def convert_load_balancers_pool_to_identifier(cf, pool_name):
121121
try:
122122
pools = cf.user.load_balancers.pools.get()
123123
except CloudFlare.exceptions.CloudFlareAPIError as e:
124-
raise ConverterError(int(e), '%s - %d %s' % (pool_name, e, e))
124+
raise ConverterError(int(e), '%s - %d %s' % (pool_name, int(e), e))
125125
except Exception as e:
126126
raise ConverterError(0, '%s - %s' % (pool_name, e))
127127

@@ -138,9 +138,9 @@ def convert_custom_hostnames_to_identifier(cf, zone_id, custom_hostname):
138138
try:
139139
custom_hostnames_records = cf.zones.custom_hostnames.get(zone_id, params=params)
140140
except CloudFlare.exceptions.CloudFlareAPIError as e:
141-
raise ConverterError(int(e), '%s - %d %s' % (dns_name, e, e))
141+
raise ConverterError(int(e), '%s - %d %s' % (custom_hostname, int(e), e))
142142
except Exception as e:
143-
raise ConverterError(0, '%s - %s' % (dns_name, e))
143+
raise ConverterError(0, '%s - %s' % (custom_hostname, e))
144144

145145
r = []
146146
for custom_hostnames_record in custom_hostnames_records:

‎pylintrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ max-args=12
3535
max-statements=160
3636
max-branches=70
3737
max-locals=40
38+
max-nested-blocks=10
3839

3940
[FORMAT]
4041
max-line-length=200

0 commit comments

Comments
 (0)