diff --git a/CloudFlare/__init__.py b/CloudFlare/__init__.py
index 12eda76..870a651 100644
--- 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
index 3e6ba5b..5d269b4 100644
--- 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
index 446f440..3ada0e8 100644
--- 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
index 5c08989..d70067e 100644
--- 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,10 +184,10 @@ 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
@@ -195,10 +195,10 @@ def __init__(self, base, api_call_part1, api_call_part2=None, api_call_part3=Non
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
@@ -206,7 +206,7 @@ def __init__(self, base, api_call_part1, api_call_part2=None, api_call_part3=Non
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,10 +216,10 @@ 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
@@ -227,7 +227,7 @@ def __init__(self, base, api_call_part1, api_call_part2=None, api_call_part3=Non
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,10 +277,10 @@ 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
@@ -288,7 +288,7 @@ def __init__(self, base, api_call_part1, api_call_part2=None, api_call_part3=Non
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
index f49a445..22caefb 100644
--- 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
index 6a27e11..3b22de9 100644
--- a/CloudFlare/logger.py
+++ b/CloudFlare/logger.py
@@ -1,14 +1,14 @@
-""" 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")
@@ -16,9 +16,9 @@ def __init__(self, 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
index d10dcc2..b85f26b 100644
--- 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
index fe1a466..b584271 100644
--- 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:
diff --git a/README.md b/README.md
index 782cd49..6e7ccc9 100644
--- a/README.md
+++ b/README.md
@@ -27,9 +27,14 @@ Yes - that simple! (the sudo may not be needed in some cases).
Or whatever variance of that you want to use.
There is a Makefile included.
-## CloudFlare API version 4
+## Cloudflare name change - dropping the capital F
-The CloudFlare API can be found [here](https://api.cloudflare.com/).
+In Sepember/October 2016 the company modified its company name and dropped the capital F.
+However, for now (and for backward compatibility reasons) the class name stays the same.
+
+## Cloudflare API version 4
+
+The Cloudflare API can be found [here](https://api.cloudflare.com/).
Each API call is provided via a similarly named function within the _CloudFlare_ class.
A full list is provided below.
@@ -102,7 +107,7 @@ if __name__ == '__main__':
main()
```
-## Providing CloudFlare Username and API Key
+## Providing Cloudflare Username and API Key
When you create a _CloudFlare_ class you can pass up to four paramaters.
@@ -157,7 +162,7 @@ The *CF_API_CERTKEY* or *certtoken* values are used for the Origin-CA */certific
You can leave *certtoken* in the configuration with a blank value (or omit the option variable fully).
The *extras* values are used when adding API calls outside of the core codebase.
-Technically, this is only useful for internal testing within CloudFlare.
+Technically, this is only useful for internal testing within Cloudflare.
You can leave *extras* in the configuration with a blank value (or omit the option variable fully).
## Included example code
@@ -405,8 +410,8 @@ extras =
$
```
-While it's easy to call anything within CloudFlare's API, it's not very useful to add items in here as they will simply return API URL errors.
-Technically, this is only useful for internal testing within CloudFlare.
+While it's easy to call anything within Cloudflare's API, it's not very useful to add items in here as they will simply return API URL errors.
+Technically, this is only useful for internal testing within Cloudflare.
## Issues
@@ -437,4 +442,4 @@ It has been seriously expanded upon.
## Copyright
-Portions copyright [Felix Wong (gnowxilef)](https://github.com/gnowxilef) 2015 and CloudFlare 2016.
+Portions copyright [Felix Wong (gnowxilef)](https://github.com/gnowxilef) 2015 and Cloudflare 2016.
diff --git a/README.rst b/README.rst
index 8086592..c797d80 100644
--- a/README.rst
+++ b/README.rst
@@ -33,10 +33,17 @@ Via github
Or whatever variance of that you want to use. There is a Makefile
included.
-CloudFlare API version 4
+Cloudflare name change - dropping the capital F
+-----------------------------------------------
+
+In Sepember/October 2016 the company modified its company name and
+dropped the capital F. However, for now (and for backward compatibility
+reasons) the class name stays the same.
+
+Cloudflare API version 4
------------------------
-The CloudFlare API can be found `here `__.
+The Cloudflare API can be found `here `__.
Each API call is provided via a similarly named function within the
*CloudFlare* class. A full list is provided below.
@@ -111,7 +118,7 @@ A more complex example follows.
if __name__ == '__main__':
main()
-Providing CloudFlare Username and API Key
+Providing Cloudflare Username and API Key
-----------------------------------------
When you create a *CloudFlare* class you can pass up to four paramaters.
@@ -178,7 +185,7 @@ configuration with a blank value (or omit the option variable fully).
The *extras* values are used when adding API calls outside of the core
codebase. Technically, this is only useful for internal testing within
-CloudFlare. You can leave *extras* in the configuration with a blank
+Cloudflare. You can leave *extras* in the configuration with a blank
value (or omit the option variable fully).
Included example code
@@ -508,9 +515,9 @@ Extra API calls can be added via the configuration file
/client/v4/command/:command_identifier/settings
$
-While it's easy to call anything within CloudFlare's API, it's not very
+While it's easy to call anything within Cloudflare's API, it's not very
useful to add items in here as they will simply return API URL errors.
-Technically, this is only useful for internal testing within CloudFlare.
+Technically, this is only useful for internal testing within Cloudflare.
Issues
------
@@ -554,4 +561,4 @@ Copyright
---------
Portions copyright `Felix Wong
-(gnowxilef) `__ 2015 and CloudFlare 2016.
+(gnowxilef) `__ 2015 and Cloudflare 2016.
diff --git a/cli4/__main__.py b/cli4/__main__.py
index 5b33133..70de4be 100755
--- a/cli4/__main__.py
+++ b/cli4/__main__.py
@@ -1,12 +1,12 @@
#!/usr/bin/env python
-"""CloudFlare API via command line"""
+"""Cloudflare API via command line"""
import sys
from cli4 import cli4
def main(args=None):
- """CloudFlare API via command line"""
+ """Cloudflare API via command line"""
if args is None:
args = sys.argv[1:]
cli4(args)
diff --git a/cli4/cli4.py b/cli4/cli4.py
index 4833bb1..e445902 100644
--- a/cli4/cli4.py
+++ b/cli4/cli4.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-"""CloudFlare API via command line"""
+"""Cloudflare API via command line"""
import os
import sys
@@ -112,7 +112,7 @@ def convert_virtual_dns_to_identifier(cf, virtual_dns_name):
exit('cli4: %s - no virtual_dns found' % (virtual_dns_name))
def cli4(args):
- """CloudFlare API via command line"""
+ """Cloudflare API via command line"""
verbose = False
output = 'json'
@@ -136,7 +136,7 @@ def cli4(args):
exit(usage)
for opt, arg in opts:
if opt in ('-V', '--version'):
- exit('CloudFlare library version: %s' % (CloudFlare.__version__))
+ exit('Cloudflare library version: %s' % (CloudFlare.__version__))
if opt in ('-h', '--help'):
exit(usage)
elif opt in ('-v', '--verbose'):
@@ -196,7 +196,7 @@ def cli4(args):
command = command[:-1]
# break down command into it's seperate pieces
- # these are then checked against the CloudFlare class
+ # these are then checked against the Cloudflare class
# to confirm there is a method that matches
parts = command.split('/')
diff --git a/examples/example_are_zones_ipv6.py b/examples/example_are_zones_ipv6.py
index 8b6c6fa..8ee1043 100755
--- a/examples/example_are_zones_ipv6.py
+++ b/examples/example_are_zones_ipv6.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-"""CloudFlare API code - example"""
+"""Cloudflare API code - example"""
import os
import sys
@@ -8,7 +8,7 @@
import CloudFlare
def main():
- """CloudFlare API code - example"""
+ """Cloudflare API code - example"""
# Check for update flag
update_ipv6 = False
diff --git a/examples/example_are_zones_ipv6_simple.py b/examples/example_are_zones_ipv6_simple.py
index cf96024..75c9604 100755
--- a/examples/example_are_zones_ipv6_simple.py
+++ b/examples/example_are_zones_ipv6_simple.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-"""CloudFlare API code - example"""
+"""Cloudflare API code - example"""
import os
import sys
@@ -8,7 +8,7 @@
import CloudFlare
def main():
- """CloudFlare API code - example"""
+ """Cloudflare API code - example"""
cf = CloudFlare.CloudFlare()
zones = cf.zones.get(params={'per_page':50})
diff --git a/examples/example_certificates.py b/examples/example_certificates.py
index 1ab68ed..f60c817 100755
--- a/examples/example_certificates.py
+++ b/examples/example_certificates.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-"""CloudFlare API code - example"""
+"""Cloudflare API code - example"""
import os
import sys
@@ -9,7 +9,7 @@
import CloudFlare
def main():
- """CloudFlare API code - example"""
+ """Cloudflare API code - example"""
# Grab the first argument, if there is one
try:
diff --git a/examples/example_create_zone_and_populate.py b/examples/example_create_zone_and_populate.py
index e4785ff..48346f9 100755
--- a/examples/example_create_zone_and_populate.py
+++ b/examples/example_create_zone_and_populate.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-"""CloudFlare API code - example"""
+"""Cloudflare API code - example"""
import os
import sys
@@ -8,7 +8,7 @@
import CloudFlare
def main():
- """CloudFlare API code - example"""
+ """Cloudflare API code - example"""
try:
zone_name = sys.argv[1]
@@ -18,7 +18,7 @@ def main():
cf = CloudFlare.CloudFlare()
# Create zone - which will only work if ...
- # 1) The zone is not on CloudFlare.
+ # 1) The zone is not on Cloudflare.
# 2) The zone passes a whois test
print 'Create zone %s ...' % (zone_name)
try:
diff --git a/examples/example_dnssec_settings.py b/examples/example_dnssec_settings.py
index 6d2b373..cf3cc86 100755
--- a/examples/example_dnssec_settings.py
+++ b/examples/example_dnssec_settings.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-"""CloudFlare API code - example"""
+"""Cloudflare API code - example"""
import os
import sys
@@ -8,7 +8,7 @@
import CloudFlare
def main():
- """CloudFlare API code - example"""
+ """Cloudflare API code - example"""
# Grab the first argument, if there is one
try:
diff --git a/examples/example_ips.py b/examples/example_ips.py
index cbe655b..6f8bd6b 100755
--- a/examples/example_ips.py
+++ b/examples/example_ips.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-"""CloudFlare API code - example"""
+"""Cloudflare API code - example"""
import os
import sys
@@ -8,7 +8,7 @@
import CloudFlare
def main():
- """CloudFlare API code - example"""
+ """Cloudflare API code - example"""
cf = CloudFlare.CloudFlare()
try:
diff --git a/examples/example_proxied.py b/examples/example_proxied.py
index e9b46ba..e88d431 100755
--- a/examples/example_proxied.py
+++ b/examples/example_proxied.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-"""CloudFlare API code - example"""
+"""Cloudflare API code - example"""
import os
import sys
diff --git a/examples/example_settings.py b/examples/example_settings.py
index b79bc8b..4842133 100755
--- a/examples/example_settings.py
+++ b/examples/example_settings.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-"""CloudFlare API code - example"""
+"""Cloudflare API code - example"""
import os
import sys
@@ -8,7 +8,7 @@
import CloudFlare
def main():
- """CloudFlare API code - example"""
+ """Cloudflare API code - example"""
# Grab the first argument, if there is one
try:
diff --git a/examples/example_update_dynamic_dns.py b/examples/example_update_dynamic_dns.py
index 4662c00..4058836 100755
--- a/examples/example_update_dynamic_dns.py
+++ b/examples/example_update_dynamic_dns.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-"""CloudFlare API code - example"""
+"""Cloudflare API code - example"""
import os
import sys
@@ -11,7 +11,7 @@
import CloudFlare
def my_ip_address():
- """CloudFlare API code - example"""
+ """Cloudflare API code - example"""
# This list is adjustable - plus some v6 enabled services are needed
# url = 'http://myip.dnsomatic.com'
@@ -33,7 +33,7 @@ def my_ip_address():
return ip_address, ip_address_type
def do_dns_update(cf, zone_name, zone_id, dns_name, ip_address, ip_address_type):
- """CloudFlare API code - example"""
+ """Cloudflare API code - example"""
try:
params = {'name':dns_name, 'match':'all', 'type':ip_address_type}
@@ -94,7 +94,7 @@ def do_dns_update(cf, zone_name, zone_id, dns_name, ip_address, ip_address_type)
print 'CREATED: %s %s' % (dns_name, ip_address)
def main():
- """CloudFlare API code - example"""
+ """Cloudflare API code - example"""
try:
dns_name = sys.argv[1]
diff --git a/examples/example_user.py b/examples/example_user.py
index 357ee36..39d23fe 100755
--- a/examples/example_user.py
+++ b/examples/example_user.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-"""CloudFlare API code - example"""
+"""Cloudflare API code - example"""
import os
import sys
@@ -9,7 +9,7 @@
import CloudFlare
def main():
- """CloudFlare API code - example"""
+ """Cloudflare API code - example"""
cf = CloudFlare.CloudFlare()
diff --git a/examples/example_zones.py b/examples/example_zones.py
index 0ba8382..7452fb7 100755
--- a/examples/example_zones.py
+++ b/examples/example_zones.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-"""CloudFlare API code - example"""
+"""Cloudflare API code - example"""
import os
import sys
@@ -9,7 +9,7 @@
import CloudFlare
def main():
- """CloudFlare API code - example"""
+ """Cloudflare API code - example"""
# Grab the first argument, if there is one
try:
diff --git a/setup.py b/setup.py
index 8acca44..6e6c8d4 100755
--- a/setup.py
+++ b/setup.py
@@ -1,11 +1,11 @@
#!/usr/bin/env python
-"""CloudFlare API code - setup.py file"""
+"""Cloudflare API code - setup.py file"""
from setuptools import setup, find_packages
from CloudFlare import __version__
def main():
- """CloudFlare API code - setup.py file"""
+ """Cloudflare API code - setup.py file"""
with open('README.rst') as read_me:
long_description = read_me.read()
@@ -13,7 +13,7 @@ def main():
setup(
name='cloudflare',
version=__version__,
- description='Python wrapper for the CloudFlare v4 API',
+ description='Python wrapper for the Cloudflare v4 API',
long_description=long_description,
author='Martin J. Levy',
author_email='martin@cloudflare.com',