diff options
| author | Jamie Lennox <jamielennox@gmail.com> | 2016-02-03 11:45:40 +1100 |
|---|---|---|
| committer | Jamie Lennox <jamielennox@gmail.com> | 2016-02-03 11:45:40 +1100 |
| commit | 2e12c0539ff5c2c86f7423e78b230a4983b713d1 (patch) | |
| tree | 1acafbe6ad04cdfcf74714ce3519ce4fc80f5eb3 | |
| parent | 410b123eedc9954a9736cf4d9da27919ff93d963 (diff) | |
| download | keystonemiddleware-2e12c0539ff5c2c86f7423e78b230a4983b713d1.tar.gz | |
Use positional instead of keystoneclient version
Use the standalone positional library rather than the utils package from
keystoneclient.
Change-Id: Iaa83e09bb45c766b35755621586700f7cde358b9
| -rw-r--r-- | keystonemiddleware/fixture.py | 4 | ||||
| -rw-r--r-- | requirements.txt | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/keystonemiddleware/fixture.py b/keystonemiddleware/fixture.py index 0db2985..ec167db 100644 --- a/keystonemiddleware/fixture.py +++ b/keystonemiddleware/fixture.py @@ -15,8 +15,8 @@ import uuid import fixtures from keystoneauth1 import fixture as client_fixtures -from keystoneclient import utils from oslo_utils import timeutils +from positional import positional from keystonemiddleware import auth_token from keystonemiddleware.auth_token import _exceptions @@ -43,7 +43,7 @@ class AuthTokenFixture(fixtures.Fixture): def tokens(self): return self._token_data.keys() - @utils.positional(1) + @positional(1) def add_token_data(self, token_id=None, expires=None, user_id=None, user_name=None, user_domain_id=None, user_domain_name=None, diff --git a/requirements.txt b/requirements.txt index 4e8e95b..733e4a9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,6 +9,7 @@ oslo.i18n>=2.1.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 oslo.utils>=3.4.0 # Apache-2.0 pbr>=1.6 # Apache-2.0 +positional>=1.0.1 # Apache-2.0 pycadf!=2.0.0,>=1.1.0 # Apache-2.0 python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0 requests!=2.9.0,>=2.8.1 # Apache-2.0 |