Merge branch 'yesbox-refactor_imports'

s0liton · Dec 30, 2016 · f82c055 · f82c055
2 parents b4465b9 + c013305
commit f82c055
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 33 deletions.
diff --git a/CloudFlare/__init__.py b/CloudFlare/__init__.py
@@ -1,8 +1,8 @@
 """ Cloudflare v4 API"""
-
-try:
-    from cloudflare import CloudFlare
-except:
-    pass
+from __future__ import absolute_import
 
 __version__ = '1.4.11'
+
+from .cloudflare import CloudFlare
+
+__all__ = ['CloudFlare']
diff --git a/CloudFlare/cloudflare.py b/CloudFlare/cloudflare.py
@@ -1,15 +1,15 @@
 """ Cloudflare v4 API"""
+from __future__ import absolute_import
 
 import json
-import urllib
 import requests
 
-from logger import Logger
-from utils import user_agent, sanitize_secrets
-from read_configs import read_configs
-from api_v4 import api_v4
-from api_extras import api_extras
-from exceptions import CloudFlareError, CloudFlareAPIError, CloudFlareInternalError
+from .logger import Logger
+from .utils import user_agent, sanitize_secrets
+from .read_configs import read_configs
+from .api_v4 import api_v4
+from .api_extras import api_extras
+from .exceptions import CloudFlareError, CloudFlareAPIError, CloudFlareInternalError
 
 BASE_URL = 'https://api.cloudflare.com/client/v4'
 

diff --git a/CloudFlare/read_configs.py b/CloudFlare/read_configs.py
@@ -2,7 +2,10 @@
 
 import os
 import re
-import ConfigParser
+try:
+    import ConfigParser  # py2
+except ImportError:
+    import configparser as ConfigParser  # py3
 
 def read_configs():
     """ reading the config file for Cloudflare API"""

diff --git a/CloudFlare/utils.py b/CloudFlare/utils.py
@@ -1,8 +1,10 @@
 """ misc utilities  for Cloudflare API"""
+from __future__ import absolute_import
 
 import sys
 import requests
-from __init__ import __version__
+
+from . import __version__
 
 def user_agent():
     """ misc utilities  for Cloudflare API"""

diff --git a/README.md b/README.md
@@ -298,7 +298,6 @@ The exception returns both an integer and textual message in one value.
 
 ```python
 import CloudFlare
-import CloudFlare.exceptions
 
     ...
     try
@@ -316,7 +315,6 @@ You can itterate over that array to see the additional error.
 ```python
 import sys
 import CloudFlare
-import CloudFlare.exceptions
 
     ...
     try

diff --git a/README.rst b/README.rst
@@ -140,7 +140,6 @@ A more complex example follows.
 .. code:: python
 
     import CloudFlare
-    import CloudFlare.exceptions
 
     def main():
         zone_name = 'example.com'
@@ -336,7 +335,6 @@ The exception returns both an integer and textual message in one value.
 .. code:: python
 
     import CloudFlare
-    import CloudFlare.exceptions
 
         ...
         try
@@ -356,7 +354,6 @@ the additional error.
 
     import sys
     import CloudFlare
-    import CloudFlare.exceptions
 
         ...
         try

diff --git a/cli4/__main__.py b/cli4/__main__.py
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
 """Cloudflare API via command line"""
+from __future__ import absolute_import
 
 import sys
 
-from cli4 import cli4
+from .cli4 import cli4
 
 def main(args=None):
     """Cloudflare API via command line"""

diff --git a/cli4/cli4.py b/cli4/cli4.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 """Cloudflare API via command line"""
 
-import os
 import sys
 import re
 import getopt
@@ -11,11 +10,9 @@
 except ImportError:
     yaml = None
 
-import converters
+from . import converters
 
-sys.path.insert(0, os.path.abspath('..'))
 import CloudFlare
-import CloudFlare.exceptions
 
 def dump_commands(cf):
     """dump a tree of all the known API commands"""

diff --git a/cli4/converters.py b/cli4/converters.py
@@ -1,12 +1,7 @@
-#!/usr/bin/env python
 """Cloudflare API via command line"""
+from __future__ import absolute_import
 
-import os
-import sys
-
-sys.path.insert(0, os.path.abspath('..'))
 import CloudFlare
-import CloudFlare.exceptions
 
 def convert_zones_to_identifier(cf, zone_name):
     """zone names to numbers"""

diff --git a/setup.py b/setup.py
@@ -1,18 +1,23 @@
 #!/usr/bin/env python
 """Cloudflare API code - setup.py file"""
-
+import re
 from setuptools import setup, find_packages
-from CloudFlare import __version__
+
+_version_re = re.compile(r"__version__\s=\s'(.*)'")
+
 
 def main():
     """Cloudflare API code - setup.py file"""
 
     with open('README.rst') as read_me:
         long_description = read_me.read()
 
+    with open('CloudFlare/__init__.py', 'r') as f:
+        version = _version_re.search(f.read()).group(1)
+
     setup(
         name='cloudflare',
-        version=__version__,
+        version=version,
         description='Python wrapper for the Cloudflare v4 API',
         long_description=long_description,
         author='Martin J. Levy',
@@ -51,5 +56,6 @@ def main():
         ]
     )
 
+
 if __name__ == '__main__':
     main()