Changed company name to Cloudflare - dropping the capital F

markllama · Oct 16, 2016 · 961c239 · 961c239
1 parent 5e8bc5a
commit 961c239
Show file tree

Hide file tree

Showing 24 changed files with 113 additions and 101 deletions.
diff --git a/CloudFlare/__init__.py b/CloudFlare/__init__.py
@@ -1,4 +1,4 @@
-""" CloudFlare v4 API"""
+""" Cloudflare v4 API"""
 
 from cloudflare import CloudFlare
 

diff --git a/CloudFlare/api_extras.py b/CloudFlare/api_extras.py
@@ -1,9 +1,9 @@
-""" API extras for CloudFlare API"""
+""" API extras for Cloudflare API"""
 
 import re
 
 def api_extras(self, extras=None):
-    """ API extras for CloudFlare API"""
+    """ API extras for Cloudflare API"""
 
     for extra in extras:
         if extra == '':

diff --git a/CloudFlare/api_v4.py b/CloudFlare/api_v4.py
@@ -1,7 +1,7 @@
-""" API core commands for CloudFlare API"""
+""" API core commands for Cloudflare API"""
 
 def api_v4(self):
-    """ API core commands for CloudFlare API"""
+    """ API core commands for Cloudflare API"""
 
     # The API commands for /user/
     setattr(self, "user",

diff --git a/CloudFlare/cloudflare.py b/CloudFlare/cloudflare.py
@@ -1,4 +1,4 @@
-""" CloudFlare v4 API"""
+""" Cloudflare v4 API"""
 
 import json
 import urllib
@@ -14,13 +14,13 @@
 BASE_URL = 'https://api.cloudflare.com/client/v4'
 
 class CloudFlare(object):
-    """ CloudFlare v4 API"""
+    """ Cloudflare v4 API"""
 
     class _base(object):
-        """ CloudFlare v4 API"""
+        """ Cloudflare v4 API"""
 
         def __init__(self, email, token, certtoken, base_url, debug):
-            """ CloudFlare v4 API"""
+            """ Cloudflare v4 API"""
 
             self.email = email
             self.token = token
@@ -38,7 +38,7 @@ def call_with_no_auth(self, method,
                               api_call_part3=None,
                               identifier1=None, identifier2=None,
                               params=None, data=None):
-            """ CloudFlare v4 API"""
+            """ Cloudflare v4 API"""
 
             headers = {
                 'Content-Type': 'application/json'
@@ -54,7 +54,7 @@ def call_with_auth(self, method,
                            api_call_part3=None,
                            identifier1=None, identifier2=None,
                            params=None, data=None):
-            """ CloudFlare v4 API"""
+            """ Cloudflare v4 API"""
 
             if self.email is '' or self.token is '':
                 raise CloudFlareAPIError(0, 'no email and/or token defined')
@@ -74,7 +74,7 @@ def call_with_certauth(self, method,
                                api_call_part3=None,
                                identifier1=None, identifier2=None,
                                params=None, data=None):
-            """ CloudFlare v4 API"""
+            """ Cloudflare v4 API"""
 
             if self.certtoken is '':
                 raise CloudFlareAPIError(0, 'no email and/or cert token defined')
@@ -93,7 +93,7 @@ def _call(self, method, headers,
                   api_call_part3=None,
                   identifier1=None, identifier2=None,
                   params=None, data=None):
-            """ CloudFlare v4 API"""
+            """ Cloudflare v4 API"""
 
             if api_call_part2 is not None or (data is not None and method == 'GET'):
                 if identifier2 is None:
@@ -184,29 +184,29 @@ def _call(self, method, headers,
             return result
 
     class add_unused(object):
-        """ CloudFlare v4 API"""
+        """ Cloudflare v4 API"""
 
         def __init__(self, base, api_call_part1, api_call_part2=None, api_call_part3=None):
-            """ CloudFlare v4 API"""
+            """ Cloudflare v4 API"""
 
             self.base = base
             self.api_call_part1 = api_call_part1
             self.api_call_part2 = api_call_part2
             self.api_call_part3 = api_call_part3
 
     class add_noauth(object):
-        """ CloudFlare v4 API"""
+        """ Cloudflare v4 API"""
 
         def __init__(self, base, api_call_part1, api_call_part2=None, api_call_part3=None):
-            """ CloudFlare v4 API"""
+            """ Cloudflare v4 API"""
 
             self.base = base
             self.api_call_part1 = api_call_part1
             self.api_call_part2 = api_call_part2
             self.api_call_part3 = api_call_part3
 
         def get(self, identifier1=None, identifier2=None, params=None, data=None):
-            """ CloudFlare v4 API"""
+            """ Cloudflare v4 API"""
 
             return self.base.call_with_no_auth('GET',
                                                self.api_call_part1,
@@ -216,18 +216,18 @@ def get(self, identifier1=None, identifier2=None, params=None, data=None):
                                                params, data)
 
     class add_with_auth(object):
-        """ CloudFlare v4 API"""
+        """ Cloudflare v4 API"""
 
         def __init__(self, base, api_call_part1, api_call_part2=None, api_call_part3=None):
-            """ CloudFlare v4 API"""
+            """ Cloudflare v4 API"""
 
             self.base = base
             self.api_call_part1 = api_call_part1
             self.api_call_part2 = api_call_part2
             self.api_call_part3 = api_call_part3
 
         def get(self, identifier1=None, identifier2=None, params=None, data=None):
-            """ CloudFlare v4 API"""
+            """ Cloudflare v4 API"""
 
             return self.base.call_with_auth('GET',
                                             self.api_call_part1,
@@ -237,7 +237,7 @@ def get(self, identifier1=None, identifier2=None, params=None, data=None):
                                             params, data)
 
         def patch(self, identifier1=None, identifier2=None, params=None, data=None):
-            """ CloudFlare v4 API"""
+            """ Cloudflare v4 API"""
 
             return self.base.call_with_auth('PATCH',
                                             self.api_call_part1,
@@ -247,7 +247,7 @@ def patch(self, identifier1=None, identifier2=None, params=None, data=None):
                                             params, data)
 
         def post(self, identifier1=None, identifier2=None, params=None, data=None):
-            """ CloudFlare v4 API"""
+            """ Cloudflare v4 API"""
 
             return self.base.call_with_auth('POST',
                                             self.api_call_part1,
@@ -257,7 +257,7 @@ def post(self, identifier1=None, identifier2=None, params=None, data=None):
                                             params, data)
 
         def put(self, identifier1=None, identifier2=None, params=None, data=None):
-            """ CloudFlare v4 API"""
+            """ Cloudflare v4 API"""
 
             return self.base.call_with_auth('PUT',
                                             self.api_call_part1,
@@ -267,7 +267,7 @@ def put(self, identifier1=None, identifier2=None, params=None, data=None):
                                             params, data)
 
         def delete(self, identifier1=None, identifier2=None, params=None, data=None):
-            """ CloudFlare v4 API"""
+            """ Cloudflare v4 API"""
 
             return self.base.call_with_auth('DELETE',
                                             self.api_call_part1,
@@ -277,18 +277,18 @@ def delete(self, identifier1=None, identifier2=None, params=None, data=None):
                                             params, data)
 
     class add_with_cert_auth(object):
-        """ CloudFlare v4 API"""
+        """ Cloudflare v4 API"""
 
         def __init__(self, base, api_call_part1, api_call_part2=None, api_call_part3=None):
-            """ CloudFlare v4 API"""
+            """ Cloudflare v4 API"""
 
             self.base = base
             self.api_call_part1 = api_call_part1
             self.api_call_part2 = api_call_part2
             self.api_call_part3 = api_call_part3
 
         def get(self, identifier1=None, identifier2=None, params=None, data=None):
-            """ CloudFlare v4 API"""
+            """ Cloudflare v4 API"""
 
             return self.base.call_with_certauth('GET',
                                                 self.api_call_part1,
@@ -298,7 +298,7 @@ def get(self, identifier1=None, identifier2=None, params=None, data=None):
                                                 params, data)
 
         def patch(self, identifier1=None, identifier2=None, params=None, data=None):
-            """ CloudFlare v4 API"""
+            """ Cloudflare v4 API"""
 
             return self.base.call_with_certauth('PATCH',
                                                 self.api_call_part1,
@@ -308,7 +308,7 @@ def patch(self, identifier1=None, identifier2=None, params=None, data=None):
                                                 params, data)
 
         def post(self, identifier1=None, identifier2=None, params=None, data=None):
-            """ CloudFlare v4 API"""
+            """ Cloudflare v4 API"""
 
             return self.base.call_with_certauth('POST',
                                                 self.api_call_part1,
@@ -318,7 +318,7 @@ def post(self, identifier1=None, identifier2=None, params=None, data=None):
                                                 params, data)
 
         def put(self, identifier1=None, identifier2=None, params=None, data=None):
-            """ CloudFlare v4 API"""
+            """ Cloudflare v4 API"""
 
             return self.base.call_with_certauth('PUT',
                                                 self.api_call_part1,
@@ -328,7 +328,7 @@ def put(self, identifier1=None, identifier2=None, params=None, data=None):
                                                 params, data)
 
         def delete(self, identifier1=None, identifier2=None, params=None, data=None):
-            """ CloudFlare v4 API"""
+            """ Cloudflare v4 API"""
 
             return self.base.call_with_certauth('DELETE',
                                                 self.api_call_part1,
@@ -338,7 +338,7 @@ def delete(self, identifier1=None, identifier2=None, params=None, data=None):
                                                 params, data)
 
     def __init__(self, email=None, token=None, certtoken=None, debug=False):
-        """ CloudFlare v4 API"""
+        """ Cloudflare v4 API"""
 
         base_url = BASE_URL
 

diff --git a/CloudFlare/exceptions.py b/CloudFlare/exceptions.py
@@ -1,31 +1,31 @@
-""" errors for CloudFlare API"""
+""" errors for Cloudflare API"""
 
 class CloudFlareError(Exception):
-    """ errors for CloudFlare API"""
+    """ errors for Cloudflare API"""
 
     def __init__(self, code, message):
-        """ errors for CloudFlare API"""
+        """ errors for Cloudflare API"""
 
         self.code = code
         self.message = message
 
     def __int__(self):
-        """ errors for CloudFlare API"""
+        """ errors for Cloudflare API"""
 
         return self.code
 
     def __str__(self):
-        """ errors for CloudFlare API"""
+        """ errors for Cloudflare API"""
 
         return self.message
 
 class CloudFlareAPIError(CloudFlareError):
-    """ errors for CloudFlare API"""
+    """ errors for Cloudflare API"""
 
     pass
 
 class CloudFlareInternalError(CloudFlareError):
-    """ errors for CloudFlare API"""
+    """ errors for Cloudflare API"""
 
     pass
 
diff --git a/CloudFlare/logger.py b/CloudFlare/logger.py
@@ -1,24 +1,24 @@
-""" Logging for CloudFlare API"""
+""" Logging for Cloudflare API"""
 import logging
 
 DEBUG = 0
 INFO = 1
 
 class Logger(object):
-    """ Logging for CloudFlare API"""
+    """ Logging for Cloudflare API"""
 
     def __init__(self, level):
-        """ Logging for CloudFlare API"""
+        """ Logging for Cloudflare API"""
         self.logger_level = self._get_logging_level(level)
         #logging.basicConfig(level=self.logger_level)
         request_logger = logging.getLogger("requests.packages.urllib3")
         request_logger.setLevel(self.logger_level)
         request_logger.propagate = level
 
     def getLogger(self):
-        """ Logging for CloudFlare API"""
+        """ Logging for Cloudflare API"""
         # create logger
-        logger = logging.getLogger('Python CloudFlare API v4')
+        logger = logging.getLogger('Python Cloudflare API v4')
         logger.setLevel(self.logger_level)
 
         ch = logging.StreamHandler()
@@ -36,7 +36,7 @@ def getLogger(self):
         return logger
 
     def _get_logging_level(self, level):
-        """ Logging for CloudFlare API"""
+        """ Logging for Cloudflare API"""
         if level is True:
             return logging.DEBUG
         else:

diff --git a/CloudFlare/read_configs.py b/CloudFlare/read_configs.py
@@ -1,11 +1,11 @@
-""" reading the config file for CloudFlare API"""
+""" reading the config file for Cloudflare API"""
 
 import os
 import re
 import ConfigParser
 
 def read_configs():
-    """ reading the config file for CloudFlare API"""
+    """ reading the config file for Cloudflare API"""
 
     # envioronment variables override config files
     email = os.getenv('CF_API_EMAIL')
@@ -23,25 +23,25 @@ def read_configs():
 
     if email is None:
         try:
-            email = re.sub(r"\s+", '', config.get('CloudFlare', 'email'))
+            email = re.sub(r"\s+", '', config.get('Cloudflare', 'email'))
         except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
             email = None
 
     if token is None:
         try:
-            token = re.sub(r"\s+", '', config.get('CloudFlare', 'token'))
+            token = re.sub(r"\s+", '', config.get('Cloudflare', 'token'))
         except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
             token = None
 
     if certtoken is None:
         try:
-            certtoken = re.sub(r"\s+", '', config.get('CloudFlare', 'certtoken'))
+            certtoken = re.sub(r"\s+", '', config.get('Cloudflare', 'certtoken'))
         except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
             certtoken = None
 
     if extras is None:
         try:
-            extras = re.sub(r"\s+", ' ', config.get('CloudFlare', 'extras'))
+            extras = re.sub(r"\s+", ' ', config.get('Cloudflare', 'extras'))
         except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
             extras = None
 

diff --git a/CloudFlare/utils.py b/CloudFlare/utils.py
@@ -1,7 +1,7 @@
-""" misc utilities  for CloudFlare API"""
+""" misc utilities  for Cloudflare API"""
 
 def sanitize_secrets(secrets):
-    """ misc utilities  for CloudFlare API"""
+    """ misc utilities  for Cloudflare API"""
     redacted_phrase = 'REDACTED'
 
     if secrets is None: