From 0888d78b84a9ff19d436cce4f646619ddf5d3db3 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Mon, 19 Oct 2015 11:42:46 -0700
Subject: [PATCH] Cleanup some pyflakes warning (1 real error)

---
 lib/ansible/plugins/cache/jsonfile.py             | 4 ++--
 lib/ansible/plugins/lookup/flattened.py           | 2 +-
 lib/ansible/plugins/lookup/inventory_hostnames.py | 1 -
 lib/ansible/plugins/lookup/sequence.py            | 2 +-
 lib/ansible/plugins/lookup/subelements.py         | 2 +-
 lib/ansible/plugins/lookup/together.py            | 4 ++--
 lib/ansible/plugins/strategy/free.py              | 2 +-
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/ansible/plugins/cache/jsonfile.py b/lib/ansible/plugins/cache/jsonfile.py
index f45c629c34e..4004288471a 100644
--- a/lib/ansible/plugins/cache/jsonfile.py
+++ b/lib/ansible/plugins/cache/jsonfile.py
@@ -26,7 +26,7 @@ except ImportError:
     import json
 
 from ansible import constants as C
-from ansible.errors import *
+from ansible.errors import AnsibleError
 from ansible.parsing.utils.jsonify import jsonify
 from ansible.plugins.cache.base import BaseCacheModule
 from ansible.utils.unicode import to_bytes
@@ -140,7 +140,7 @@ class CacheModule(BaseCacheModule):
             pass
         try:
             os.remove("%s/%s" % (self._cache_dir, key))
-        except (OSError,IOError) as e:
+        except (OSError, IOError):
             pass #TODO: only pass on non existing?
 
     def flush(self):
diff --git a/lib/ansible/plugins/lookup/flattened.py b/lib/ansible/plugins/lookup/flattened.py
index b9e1009c26c..adf8b0c8edf 100644
--- a/lib/ansible/plugins/lookup/flattened.py
+++ b/lib/ansible/plugins/lookup/flattened.py
@@ -17,7 +17,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible.errors import *
+from ansible.errors import AnsibleError
 from ansible.plugins.lookup import LookupBase
 from ansible.utils.listify import listify_lookup_plugin_terms
 
diff --git a/lib/ansible/plugins/lookup/inventory_hostnames.py b/lib/ansible/plugins/lookup/inventory_hostnames.py
index 118f3d163ff..87cbe7d48ae 100644
--- a/lib/ansible/plugins/lookup/inventory_hostnames.py
+++ b/lib/ansible/plugins/lookup/inventory_hostnames.py
@@ -19,7 +19,6 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible.errors import *
 from ansible.plugins.lookup import LookupBase
 from ansible.inventory import Inventory
 
diff --git a/lib/ansible/plugins/lookup/sequence.py b/lib/ansible/plugins/lookup/sequence.py
index 319173d5a9f..c07337c6db0 100644
--- a/lib/ansible/plugins/lookup/sequence.py
+++ b/lib/ansible/plugins/lookup/sequence.py
@@ -19,7 +19,7 @@ __metaclass__ = type
 
 from re import compile as re_compile, IGNORECASE
 
-from ansible.errors import *
+from ansible.errors import AnsibleError
 from ansible.parsing.splitter import parse_kv
 from ansible.plugins.lookup import LookupBase
 
diff --git a/lib/ansible/plugins/lookup/subelements.py b/lib/ansible/plugins/lookup/subelements.py
index 5ac384f6f14..2595786ec90 100644
--- a/lib/ansible/plugins/lookup/subelements.py
+++ b/lib/ansible/plugins/lookup/subelements.py
@@ -17,7 +17,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible.errors import *
+from ansible.errors import AnsibleError
 from ansible.plugins.lookup import LookupBase
 from ansible.utils.listify import listify_lookup_plugin_terms
 from ansible.utils.boolean import boolean
diff --git a/lib/ansible/plugins/lookup/together.py b/lib/ansible/plugins/lookup/together.py
index ac94a414f25..dca47bb4475 100644
--- a/lib/ansible/plugins/lookup/together.py
+++ b/lib/ansible/plugins/lookup/together.py
@@ -19,7 +19,7 @@ __metaclass__ = type
 
 from itertools import izip_longest
 
-from ansible.errors import *
+from ansible.errors import AnsibleError
 from ansible.plugins.lookup import LookupBase
 from ansible.utils.listify import listify_lookup_plugin_terms
 
@@ -44,7 +44,7 @@ class LookupModule(LookupBase):
 
         my_list = terms[:]
         if len(my_list) == 0:
-            raise errors.AnsibleError("with_together requires at least one element in each list")
+            raise AnsibleError("with_together requires at least one element in each list")
 
         return [self._flatten(x) for x in izip_longest(*my_list, fillvalue=None)]
 
diff --git a/lib/ansible/plugins/strategy/free.py b/lib/ansible/plugins/strategy/free.py
index 3c420008b9b..ddad89d3271 100644
--- a/lib/ansible/plugins/strategy/free.py
+++ b/lib/ansible/plugins/strategy/free.py
@@ -21,7 +21,7 @@ __metaclass__ = type
 
 import time
 
-from ansible.errors import *
+from ansible.errors import AnsibleError
 from ansible.playbook.included_file import IncludedFile
 from ansible.plugins.strategy import StrategyBase