Merge branch 'cleanup-imports' of https://github.com/jdavisp3/ansible into devel

lib/ansible/inventory/host.py

@@ -15,7 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-from ansible import errors
 import ansible.constants as C
 
 class Host(object):
@@ -63,4 +62,3 @@ class Host(object):
         groups = self.get_groups()
         results['group_names'] = sorted([ g.name for g in groups if g.name != 'all'])
         return results
-

lib/ansible/inventory/ini.py

@@ -17,17 +17,13 @@
 
 #############################################
 
-import fnmatch
-import os
-import subprocess
-
 import ansible.constants as C
 from ansible.inventory.host import Host
 from ansible.inventory.group import Group
 from ansible.inventory.expand_hosts import detect_range
 from ansible.inventory.expand_hosts import expand_hostname_range
 from ansible import errors
-from ansible import utils
+
 
 class InventoryParser(object):
     """
@@ -170,5 +166,3 @@ class InventoryParser(object):
                 else:
                     (k,v) = line.split("=",1)
                     group.set_variable(k,v)
-
-

lib/ansible/inventory/script.py

@@ -17,12 +17,10 @@
 
 #############################################
 
-import os
 import subprocess
 import ansible.constants as C
 from ansible.inventory.host import Host
 from ansible.inventory.group import Group
-from ansible import errors
 from ansible import utils
 
 class InventoryScript(object):
@@ -53,4 +51,3 @@ class InventoryScript(object):
                 all.add_host(host)
             all.add_child_group(group)
         return groups
-

lib/ansible/runner/__init__.py

@@ -24,12 +24,8 @@ import random
 import traceback
 import tempfile
 import time
-import base64
-import getpass
-import codecs
 import collections
 import socket
-import re
 
 import ansible.constants as C
 import ansible.inventory
@@ -38,7 +34,7 @@ from ansible import errors
 from ansible import module_common
 import poller
 import connection
-from ansible.callbacks import DefaultRunnerCallbacks, vv, vvv
+from ansible.callbacks import DefaultRunnerCallbacks, vv
 
 HAS_ATFORK=True
 try:
@@ -803,4 +799,3 @@ class Runner(object):
         self.background = time_limit
         results = self.run()
         return results, poller.AsyncPoller(results, self)
-

lib/ansible/runner/connection/paramiko_ssh.py

@@ -16,15 +16,10 @@
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
 import warnings
-import traceback
 import os
-import re
-import shutil
-import subprocess
 import pipes
 import socket
 import random
-from ansible import utils
 from ansible.callbacks import vvv
 from ansible import errors
 

lib/ansible/utils.py

@@ -25,7 +25,6 @@ import yaml
 import optparse
 import operator
 from ansible import errors
-from ansible import color
 from ansible import __version__
 import ansible.constants as C
 import time

test/TestInventory.py

@@ -2,8 +2,6 @@ import os
 import unittest
 
 from ansible.inventory import Inventory
-from ansible.runner import Runner
-# from nose.plugins.skip import SkipTest
 
 class TestInventory(unittest.TestCase):
 
@@ -236,4 +234,3 @@ class TestInventory(unittest.TestCase):
                         'group_names': ['norse'],
                         'inventory_hostname': 'thor',
                         'inventory_hostname_short': 'thor'}
-

test/TestPlayBook.py

@@ -10,11 +10,6 @@ import ansible.utils as utils
 import ansible.callbacks as ans_callbacks
 import os
 import shutil
-import time
-try:
-   import json
-except:
-   import simplejson as json
 
 EVENTS = []
 

test/TestRunner.py

@@ -10,10 +10,6 @@ import os
 import shutil
 import time
 import tempfile
-try:
-    import json
-except:
-    import simplejson as json
 
 from nose.plugins.skip import SkipTest
 

test/TestUtils.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import os
 import unittest
 
 import ansible.utils