From 44ce9010085ed6bb427c34a9ff71acf39d1888b4 Mon Sep 17 00:00:00 2001
From: Morgan Fainberg <m@metacloud.com>
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 ---
 tox.ini                  | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/keystoneclient/access.py b/keystoneclient/access.py
index 483e8935..53cb0ffd 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/tox.ini b/tox.ini
index 78df6644..c41c8b8b 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