pylint made me do this! - yet there is still more to do

Author: mahtin

CloudFlare/api_extras.py

@@ -54,4 +54,3 @@ def api_extras(self, extras=None):
                 setattr(current, element,
                         self._add_with_auth(self._base, api_call_part1))
             current = getattr(current, element)
-

CloudFlare/api_v4.py

@@ -8,6 +8,7 @@ def api_v4(self):
     user_audit_logs(self)
     user_load_balancers(self)
     user_load_balancing_analytics(self)
+    user_tokens_verify(self)
     user_virtual_dns(self)
     user_workers(self)
 
@@ -315,7 +316,6 @@ def user_virtual_dns(self):
     self.add('VOID', "user/virtual_dns", "dns_analytics")
     self.add('AUTH', "user/virtual_dns", "dns_analytics/report")
     self.add('AUTH', "user/virtual_dns", "dns_analytics/report/bytime")
-    return
 
 def user_workers(self):
     """ API core commands for Cloudflare API"""
@@ -330,7 +330,6 @@ def organizations_virtual_dns(self):
     self.add('VOID', "organizations", "virtual_dns", "dns_analytics")
     self.add('AUTH', "organizations", "virtual_dns", "dns_analytics/report")
     self.add('AUTH', "organizations", "virtual_dns", "dns_analytics/report/bytime")
-    return
 
 def user_audit_logs(self):
     """ API core commands for Cloudflare API"""
@@ -344,6 +343,12 @@ def user_load_balancing_analytics(self):
     self.add('AUTH', "user", "load_balancing_analytics/events")
     self.add('AUTH', "user", "load_balancing_analytics/entities")
 
+def user_tokens_verify(self):
+    """ API core commands for Cloudflare API"""
+
+    self.add('VOID', "user/tokens")
+    self.add('AUTH', "user/tokens/verify")
+
 def organizations_audit_logs(self):
     """ API core commands for Cloudflare API"""
 
@@ -416,4 +421,3 @@ def memberships(self):
     """ API core commands for Cloudflare API"""
 
     self.add('AUTH', "memberships")
-

CloudFlare/cloudflare.py

@@ -79,7 +79,7 @@ def call_with_auth(self, method, parts,
             headers = {}
             self._add_headers(headers)
             self._add_auth_headers(headers)
-            if type(data) == str:
+            if isinstance(data, str):
                 # passing javascript vs JSON
                 headers['Content-Type'] = 'application/javascript'
             if files:
@@ -99,7 +99,7 @@ def call_with_auth_unwrapped(self, method, parts,
             headers = {}
             self._add_headers(headers)
             self._add_auth_headers(headers)
-            if type(data) == str:
+            if isinstance(data, str):
                 # passing javascript vs JSON
                 headers['Content-Type'] = 'application/javascript'
             if files:
@@ -195,7 +195,7 @@ def _network(self, method, headers, parts,
                                                 params=params,
                                                 data=data)
                 elif method == 'POST':
-                    if type(data) == str:
+                    if isinstance(data, str):
                         response = self.session.post(url,
                                                      headers=headers,
                                                      params=params,
@@ -208,7 +208,7 @@ def _network(self, method, headers, parts,
                                                      json=data,
                                                      files=files)
                 elif method == 'PUT':
-                    if type(data) == str:
+                    if isinstance(data, str):
                         response = self.session.put(url,
                                                     headers=headers,
                                                     params=params,
@@ -219,7 +219,7 @@ def _network(self, method, headers, parts,
                                                     params=params,
                                                     json=data)
                 elif method == 'DELETE':
-                    if type(data) == str:
+                    if isinstance(data, str):
                         response = self.session.delete(url,
                                                        headers=headers,
                                                        params=params,
@@ -230,7 +230,7 @@ def _network(self, method, headers, parts,
                                                        params=params,
                                                        json=data)
                 elif method == 'PATCH':
-                    if type(data) == str:
+                    if isinstance(data, str):
                         response = self.session.request('PATCH', url,
                                                         headers=headers,
                                                         params=params,
@@ -265,7 +265,7 @@ def _network(self, method, headers, parts,
                 response_type = 'application/octet-stream'
             response_code = response.status_code
             response_data = response.content
-            if type(response_data) != str:
+            if not isinstance(response_data, str):
                 response_data = response_data.decode("utf-8")
 
             if self.logger:
@@ -829,7 +829,7 @@ def __init__(self, email=None, token=None, certtoken=None, debug=False, raw=Fals
 
         # class creation values override configuration values
         try:
-            [conf_email, conf_token, conf_certtoken, extras] = read_configs(profile)
+            [conf_email, conf_token, conf_certtoken, extras, profile] = read_configs(profile)
         except:
             raise CloudFlareAPIError(0, 'profile/configuration read error')
 
@@ -873,23 +873,24 @@ def __str__(self):
         """ Cloudflare v4 API"""
 
         if self._base.email is None:
-            return '["%s"]' % ('REDACTED')
+            s = '["%s","%s"]' % (self._base.profile, 'REDACTED')
         else:
-            return '["%s","%s","%s"]' % (self._base.profile, self._base.email, 'REDACTED')
+            s = '["%s","%s","%s"]' % (self._base.profile, self._base.email, 'REDACTED')
+        return s
 
     def __repr__(self):
         """ Cloudflare v4 API"""
 
         if self._base.email is None:
-            return '%s,%s(%s,"%s","%s","%s",%s,"%s")' % (
+            s = '%s,%s("%s","%s","%s","%s",%s,"%s")' % (
                 self.__module__, type(self).__name__,
                 self._base.profile, 'REDACTED', 'REDACTED',
                 self._base.base_url, self._base.raw, self._base.user_agent
             )
         else:
-            return '%s,%s(%s,"%s","%s","%s","%s",%s,"%s")' % (
+            s = '%s,%s("%s","%s","%s","%s","%s",%s,"%s")' % (
                 self.__module__, type(self).__name__,
                 self._base.profile, self._base.email, 'REDACTED', 'REDACTED',
                 self._base.base_url, self._base.raw, self._base.user_agent
             )
-
+        return s

CloudFlare/exceptions.py

@@ -19,7 +19,7 @@ def __init__(self, code, message, error_chain=None):
 
         self.evalue = self.CodeMessage(int(code), str(message))
         self.error_chain = None
-        if error_chain != None:
+        if error_chain is not None:
             self.error_chain = []
             for evalue in error_chain:
                 self.error_chain.append(
@@ -41,8 +41,7 @@ def __len__(self):
 
         if self.error_chain is None:
             return 0
-        else:
-            return len(self.error_chain)
+        return len(self.error_chain)
 
     def __getitem__(self, ii):
         """ Cloudflare API errors can contain a chain of errors"""
@@ -53,23 +52,18 @@ def __iter__(self):
         """ Cloudflare API errors can contain a chain of errors"""
 
         if self.error_chain is None:
-            raise StopIteration
+            return
         for evalue in self.error_chain:
             yield evalue
 
     def next(self):
         """ Cloudflare API errors can contain a chain of errors"""
 
         if self.error_chain is None:
-            raise StopIteration()
+            raise StopIteration
 
 class CloudFlareAPIError(CloudFlareError):
     """ errors for Cloudflare API"""
 
-    pass
-
 class CloudFlareInternalError(CloudFlareError):
     """ errors for Cloudflare API"""
-
-    pass
-

CloudFlare/logging_helper.py

@@ -47,5 +47,4 @@ def _get_logging_level(self, level):
         """ Logging for Cloudflare API"""
         if level is True:
             return logging.DEBUG
-        else:
-            return logging.INFO
+        return logging.INFO

CloudFlare/read_configs.py

@@ -30,7 +30,7 @@ def read_configs(profile=None):
     if len(config.sections()) == 0:
         ## no config file found - so env values (even if empty) should be returned
         ## this isn't an error
-        return [email, token, certtoken, extras]
+        return [email, token, certtoken, extras, profile]
 
     if profile not in config.sections():
         ## section is missing - this is an error
@@ -63,5 +63,4 @@ def read_configs(profile=None):
         if extras:
             extras = extras.split(' ')
 
-    return [email, token, certtoken, extras]
-
+    return [email, token, certtoken, extras, profile]