summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhijunWei <wzj334965317@outlook.com>2018-12-28 23:03:56 +0800
committerZhijunWei <wzj334965317@outlook.com>2019-01-04 00:46:27 +0800
commit3f6f14d4fe8231c72756e88c1dd1a6fa34c1d724 (patch)
tree61f1b37ed223470e6680d6604355860a4576f58a
parenta69e14e3fc6e478725f39bbccf7621cc8852bd4c (diff)
downloadpython-keystoneclient-3f6f14d4fe8231c72756e88c1dd1a6fa34c1d724.tar.gz
Update hacking version
1. update hacking version to latest 2. fix pep8 failed Change-Id: Iecc112206633a7e771c5e45547c573d74cce6f67
-rw-r--r--keystoneclient/access.py6
-rw-r--r--test-requirements.txt2
2 files changed, 4 insertions, 4 deletions
diff --git a/keystoneclient/access.py b/keystoneclient/access.py
index f8174f6..a93da0a 100644
--- a/keystoneclient/access.py
+++ b/keystoneclient/access.py
@@ -554,9 +554,9 @@ class AccessInfoV2(AccessInfo):
'scoped is deprecated as of the 1.7.0 release in favor of '
'project_scoped and may be removed in the 2.0.0 release.',
DeprecationWarning)
- if ('serviceCatalog' in self
- and self['serviceCatalog']
- and 'tenant' in self['token']):
+ if ('serviceCatalog' in self and
+ self['serviceCatalog'] and
+ 'tenant' in self['token']):
return True
return False
diff --git a/test-requirements.txt b/test-requirements.txt
index 92ffcf6..873b0e6 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,7 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-hacking<0.11,>=0.10.0
+hacking>=1.1.0,<1.2.0 # Apache-2.0
flake8-docstrings==0.2.1.post1 # MIT
coverage!=4.4,>=4.0 # Apache-2.0