From be300b562afce5fcf5000837da8b36fc6df70c05 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael.dehaan@gmail.com>
Date: Tue, 30 Oct 2012 20:47:05 -0400
Subject: [PATCH] pyflakes fixes (mostly unused imports, unused vars)

---
 bin/ansible-playbook     |  1 -
 lib/ansible/constants.py |  1 -
 lib/ansible/template.py  | 14 +-------------
 lib/ansible/utils.py     |  9 ++-------
 4 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/bin/ansible-playbook b/bin/ansible-playbook
index 5b52cfe967b..3587fa4662a 100755
--- a/bin/ansible-playbook
+++ b/bin/ansible-playbook
@@ -18,7 +18,6 @@
 
 #######################################################
 
-import os
 import sys
 import getpass
 
diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py
index e9a2056b34a..a978c496683 100644
--- a/lib/ansible/constants.py
+++ b/lib/ansible/constants.py
@@ -18,7 +18,6 @@
 import os
 import pwd
 import ConfigParser
-import traceback
 
 def get_config(p, section, key, env_var, default):
     if env_var is not None:
diff --git a/lib/ansible/template.py b/lib/ansible/template.py
index 767266da04b..3d380b837d0 100644
--- a/lib/ansible/template.py
+++ b/lib/ansible/template.py
@@ -15,22 +15,15 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-import sys
 import os
-import shlex
 import re
 import codecs
 import jinja2
 import yaml
-import operator
 import json
 from ansible import errors
-from ansible import __version__
 import ansible.constants as C
 import time
-import StringIO
-import imp
-import glob
 import subprocess
 import datetime
 import pwd
@@ -87,7 +80,6 @@ def _varFind(text, vars, depth=0):
         is_complex = False
         brace_level = 0
     end = var_start
-    path = []
     part_start = (var_start, brace_level)
     space = vars
     while end < len(text) and ((is_complex and brace_level > 0) or not is_complex):
@@ -195,10 +187,7 @@ def varReplaceWithItems(basedir, varname, vars):
         if not m:
             return varname
         if m['start'] == 0 and m['end'] == len(varname):
-            try:
-                return varReplaceWithItems(basedir, m['replacement'], vars)
-            except VarNotFoundException:
-                return varname
+            return varReplaceWithItems(basedir, m['replacement'], vars)
         else:
             return template(basedir, varname, vars)
     elif isinstance(varname, (list, tuple)):
@@ -214,7 +203,6 @@ def varReplaceWithItems(basedir, varname, vars):
 def template(basedir, text, vars, expand_lists=False):
     ''' run a text buffer through the templating engine until it no longer changes '''
 
-    prev_text = ''
     try:
         text = text.decode('utf-8')
     except UnicodeEncodeError:
diff --git a/lib/ansible/utils.py b/lib/ansible/utils.py
index aeeadd72cc2..0b18444afa5 100644
--- a/lib/ansible/utils.py
+++ b/lib/ansible/utils.py
@@ -18,9 +18,6 @@
 import sys
 import os
 import shlex
-import re
-import codecs
-import jinja2
 import yaml
 import optparse
 import operator
@@ -32,12 +29,9 @@ import time
 import StringIO
 import imp
 import glob
-import subprocess
 import stat
 import termios
 import tty
-import datetime
-import pwd
 
 VERBOSITY=0
 
@@ -60,6 +54,7 @@ except:
 
 KEYCZAR_AVAILABLE=False
 try:
+    import keyczar.errors as key_errors
     from keyczar.keys import AesKey
     KEYCZAR_AVAILABLE=True
 except ImportError:
@@ -99,7 +94,7 @@ def encrypt(key, msg):
 def decrypt(key, msg):
     try:
         return key.Decrypt(msg)
-    except keyczar.errors.InvalidSignatureError:
+    except key_errors.InvalidSignatureError:
         raise errors.AnsibleError("decryption failed")
 
 ###############################################################