From d21f73ab28c61b8d2db9f5fc3399714e50fcbc0c Mon Sep 17 00:00:00 2001 From: Morgan Fainberg Date: Sun, 18 Aug 2013 20:12:13 -0700 Subject: [PATCH] Fix and enable gating on F811 Fixes duplicate method definitions and enables gating on F811 Change-Id: Ic360e70d13da864b8b5c10fc5e731b3952b2d2e8 --- keystoneclient/access.py | 3 --- keystoneclient/httpclient.py | 9 --------- tox.ini | 3 +-- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/keystoneclient/access.py b/keystoneclient/access.py index 483e8935c..53cb0ffd7 100644 --- a/keystoneclient/access.py +++ b/keystoneclient/access.py @@ -61,9 +61,6 @@ class AccessInfo(dict): self.service_catalog = service_catalog.ServiceCatalog.factory( resource_dict=self, region_name=self.get('region_name')) - def has_service_catalog(self): - return 'serviceCatalog' in self - def will_expire_soon(self, stale_duration=None): """Determines if expiration is about to occur. diff --git a/keystoneclient/httpclient.py b/keystoneclient/httpclient.py index 5392557f9..c92175ee7 100644 --- a/keystoneclient/httpclient.py +++ b/keystoneclient/httpclient.py @@ -589,15 +589,6 @@ class HTTPClient(object): def serialize(self, entity): return json.dumps(entity) - @property - def service_catalog(self): - """Returns this client's service catalog.""" - return self.auth_ref.service_catalog - - def has_service_catalog(self): - """Returns True if this client provides a service catalog.""" - return self.auth_ref.has_service_catalog() - def request(self, url, method, body=None, **kwargs): """Send an http request with the specified characteristics. diff --git a/tox.ini b/tox.ini index 78df66446..c41c8b8b2 100644 --- a/tox.ini +++ b/tox.ini @@ -27,9 +27,8 @@ commands = python setup.py testr --coverage --testr-args='{posargs}' downloadcache = ~/cache/pip [flake8] -# F811: redefinition of unused 'client' from line 81 # F821: undefined name # H304: no relative imports -ignore = F811,F821,H304 +ignore = F821,H304 show-source = True exclude = .venv,.tox,dist,doc,*egg,build