Removed a couple unused pieces

Author: Clark Perkins

stackdio/cli/__init__.py

@@ -7,22 +7,16 @@
 import os
 import sys
 
-from cmd2 import Cmd
 import keyring
+from cmd2 import Cmd
 from requests import ConnectionError
 
-
-from stackdio.client import StackdIO
-
 from stackdio.cli import mixins
+from stackdio.client import StackdIO
 
 
-class StackdioShell(
-        Cmd,
-        mixins.bootstrap.BootstrapMixin,
-        mixins.stacks.StackMixin,
-        mixins.formulas.FormulaMixin,
-        mixins.blueprints.BlueprintMixin):
+class StackdioShell(Cmd, mixins.bootstrap.BootstrapMixin, mixins.stacks.StackMixin,
+                    mixins.formulas.FormulaMixin, mixins.blueprints.BlueprintMixin):
 
     CFG_DIR = os.path.expanduser("~/.stackdio-cli/")
     CFG_FILE = os.path.join(CFG_DIR, "config.json")
@@ -192,7 +186,6 @@ def do_account_summary(self, args=None):
 
 
 def main():
-
     parser = argparse.ArgumentParser(
         description="Invoke the stackdio cli")
     parser.add_argument("--debug", action="store_true", help="Enable debugging output")

stackdio/client/__init__.py

@@ -17,17 +17,15 @@
 
 import logging
 
-from .http import get, post, patch
-from .exceptions import BlueprintException, StackException, IncompatibleVersionException
-
+from .account import AccountMixin
 from .blueprint import BlueprintMixin
+from .exceptions import BlueprintException, StackException, IncompatibleVersionException
 from .formula import FormulaMixin
-from .account import AccountMixin
+from .http import get, post, patch
 from .image import ImageMixin
 from .region import RegionMixin
 from .settings import SettingsMixin
 from .stack import StackMixin
-
 from .version import _parse_version_string
 
 logger = logging.getLogger(__name__)
@@ -37,10 +35,7 @@ class StackdIO(BlueprintMixin, FormulaMixin, AccountMixin,
                ImageMixin, RegionMixin, StackMixin, SettingsMixin):
 
     def __init__(self, protocol="https", host="localhost", port=443,
-                 base_url=None, auth=None, auth_admin=None,
-                 verify=True):
-        """auth_admin is optional, only needed for creating provider, profile,
-        and base security groups"""
+                 base_url=None, auth=None, verify=True):
 
         super(StackdIO, self).__init__(auth=auth, verify=verify)
         if base_url:
@@ -52,7 +47,6 @@ def __init__(self, protocol="https", host="localhost", port=443,
                 port=port)
 
         self.auth = auth
-        self.auth_admin = auth_admin
 
         _, self.version = _parse_version_string(self.get_version())
 

stackdio/client/exceptions.py

@@ -24,10 +24,6 @@ class BlueprintException(Exception):
     pass
 
 
-class NoAdminException(Exception):
-    pass
-
-
 class IncompatibleVersionException(Exception):
     pass
 

stackdio/client/http.py

@@ -21,17 +21,16 @@
 import logging
 import requests
 
-from functools import wraps
 from inspect import getcallargs
 
-from .exceptions import NoAdminException
-
 logger = logging.getLogger(__name__)
+logger.addHandler(logging.NullHandler())
 
 HTTP_INSECURE_MESSAGE = "\n".join([
     "You have chosen not to verify ssl connections.",
     "This is insecure, but it's your choice.",
-    "This has been your single warning."])
+    "This has been your single warning."
+])
 
 
 class HttpMixin(object):
@@ -49,7 +48,7 @@ def __init__(self, auth=None, verify=True):
             'auth': auth,
             'verify': verify,
         }
-        self._http_log = logging.getLogger(__name__)
+        self._http_log = logger
 
         if not verify:
             if self._http_log.handlers:
@@ -95,7 +94,8 @@ def response(self, rfunc):
 
         def __repr__(self):
             if self.obj:
-                return '<bound method HTTP {0} request for \'/api/{1}\' on {2}>'.format(method, path, repr(self.obj))
+                return ('<bound method HTTP {0} request for '
+                        '\'/api/{1}\' on {2}>'.format(method, path, repr(self.obj)))
             else:
                 return super(Request, self).__repr__()
 
@@ -180,7 +180,6 @@ def __call__(self, *args, **kwargs):
 
 
 # Define the decorators for all the methods
-
 def get(path, paginate=False, jsonify=True):
     return request(path, 'GET', paginate=paginate, jsonify=jsonify)
 
@@ -207,23 +206,3 @@ def patch(path):
 
 def delete(path):
     return request(path, 'DELETE')
-
-
-def use_admin_auth(func):
-
-    @wraps(func)
-    def wrapper(obj, *args, **kwargs):
-        # Save and set the auth to use the admin auth
-        auth = obj._http_options['auth']
-        try:
-            obj._http_options['auth'] = obj._http_options['admin']
-        except KeyError:
-            raise NoAdminException("No admin credentials were specified")
-
-        # Call the original function
-        output = func(*args, **kwargs)
-
-        # Set the auth back to the original
-        obj._http_options['auth'] = auth
-        return output
-    return wrapper