use positional library instead of utils

swap instances of utils.positional with the positional library.

Change-Id: Id8a9961e68d287a802f25512fc970829e9feb5c2

7 files changed, 17 insertions, 13 deletions

diff --git a/keystoneclient/auth/cli.py b/keystoneclient/auth/cli.py
index 40a81c1..172049e 100644
--- a/keystoneclient/auth/cli.py
+++ b/keystoneclient/auth/cli.py
@@ -13,11 +13,12 @@
 import argparse
 import os
 
+from positional import positional
+
 from keystoneclient.auth import base
-from keystoneclient import utils
 
 
-@utils.positional()
+@positional()
 def register_argparse_arguments(parser, argv, default=None):
     """Register CLI options needed to create a plugin.
 
diff --git a/keystoneclient/auth/identity/access.py b/keystoneclient/auth/identity/access.py
index 46df3bf..5849b75 100644
--- a/keystoneclient/auth/identity/access.py
+++ b/keystoneclient/auth/identity/access.py
@@ -10,8 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from positional import positional
+
 from keystoneclient.auth.identity import base
-from keystoneclient import utils
 
 
 class AccessInfoPlugin(base.BaseIdentityPlugin):
@@ -31,7 +32,7 @@ class AccessInfoPlugin(base.BaseIdentityPlugin):
                      if using the AUTH_INTERFACE with get_endpoint. (optional)
     """
 
-    @utils.positional()
+    @positional()
     def __init__(self, auth_ref, auth_url=None):
         super(AccessInfoPlugin, self).__init__(auth_url=auth_url,
                                                reauthenticate=False)
diff --git a/keystoneclient/auth/identity/base.py b/keystoneclient/auth/identity/base.py
index 5737697..854c106 100644
--- a/keystoneclient/auth/identity/base.py
+++ b/keystoneclient/auth/identity/base.py
@@ -16,13 +16,13 @@ import threading
 import warnings
 
 from oslo_config import cfg
+from positional import positional
 import six
 
 from keystoneclient import _discover
 from keystoneclient.auth import base
 from keystoneclient import exceptions
 from keystoneclient.i18n import _LW
-from keystoneclient import utils
 
 LOG = logging.getLogger(__name__)
 
@@ -371,7 +371,7 @@ class BaseIdentityPlugin(base.BaseAuthPlugin):
     def get_project_id(self, session, **kwargs):
         return self.get_access(session).project_id
 
-    @utils.positional()
+    @positional()
     def get_discovery(self, session, url, authenticated=None):
         """Return the discovery object for a URL.
 
diff --git a/keystoneclient/auth/identity/generic/cli.py b/keystoneclient/auth/identity/generic/cli.py
index 212e9b7..9debf63 100644
--- a/keystoneclient/auth/identity/generic/cli.py
+++ b/keystoneclient/auth/identity/generic/cli.py
@@ -11,11 +11,11 @@
 # under the License.
 
 from oslo_config import cfg
+from positional import positional
 
 from keystoneclient.auth.identity.generic import password
 from keystoneclient import exceptions as exc
 from keystoneclient.i18n import _
-from keystoneclient import utils
 
 
 class DefaultCLI(password.Password):
@@ -25,7 +25,7 @@ class DefaultCLI(password.Password):
     as well as allowing users to override with a custom token and endpoint.
     """
 
-    @utils.positional()
+    @positional()
     def __init__(self, endpoint=None, token=None, **kwargs):
         super(DefaultCLI, self).__init__(**kwargs)
 
diff --git a/keystoneclient/auth/identity/generic/password.py b/keystoneclient/auth/identity/generic/password.py
index 3527b19..ba3b9d2 100644
--- a/keystoneclient/auth/identity/generic/password.py
+++ b/keystoneclient/auth/identity/generic/password.py
@@ -13,6 +13,7 @@
 import logging
 
 from oslo_config import cfg
+from positional import positional
 
 from keystoneclient import _discover
 from keystoneclient.auth.identity.generic import base
@@ -45,7 +46,7 @@ class Password(base.BaseGenericPlugin):
 
     """
 
-    @utils.positional()
+    @positional()
     def __init__(self, auth_url, username=None, user_id=None, password=None,
                  user_domain_id=None, user_domain_name=None, **kwargs):
         super(Password, self).__init__(auth_url=auth_url, **kwargs)
diff --git a/keystoneclient/auth/identity/v2.py b/keystoneclient/auth/identity/v2.py
index 5de4527..6a403dc 100644
--- a/keystoneclient/auth/identity/v2.py
+++ b/keystoneclient/auth/identity/v2.py
@@ -14,6 +14,7 @@ import abc
 import logging
 
 from oslo_config import cfg
+from positional import positional
 import six
 
 from keystoneclient import access
@@ -48,7 +49,7 @@ class Auth(base.BaseIdentityPlugin):
 
         return options
 
-    @utils.positional()
+    @positional()
     def __init__(self, auth_url,
                  trust_id=None,
                  tenant_id=None,
@@ -127,7 +128,7 @@ class Password(Auth):
     :raises TypeError: if a user_id or username is not provided.
     """
 
-    @utils.positional(4)
+    @positional(4)
     def __init__(self, auth_url, username=_NOT_PASSED, password=None,
                  user_id=_NOT_PASSED, **kwargs):
         super(Password, self).__init__(auth_url, **kwargs)
diff --git a/keystoneclient/auth/identity/v3/base.py b/keystoneclient/auth/identity/v3/base.py
index 43a0bd7..510fa66 100644
--- a/keystoneclient/auth/identity/v3/base.py
+++ b/keystoneclient/auth/identity/v3/base.py
@@ -14,13 +14,13 @@ import abc
 import logging
 
 from oslo_config import cfg
+from positional import positional
 import six
 
 from keystoneclient import access
 from keystoneclient.auth.identity import base
 from keystoneclient import exceptions
 from keystoneclient.i18n import _
-from keystoneclient import utils
 
 _logger = logging.getLogger(__name__)
 
@@ -46,7 +46,7 @@ class BaseAuth(base.BaseIdentityPlugin):
                                  token. (optional) default True.
     """
 
-    @utils.positional()
+    @positional()
     def __init__(self, auth_url,
                  trust_id=None,
                  domain_id=None,