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

This commit is contained in:
Michael DeHaan
2012-08-10 00:05:04 -04:00
10 changed files with 2 additions and 37 deletions

View File

@@ -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)

View File

@@ -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