Merge pull request #921 from moreati/import-cleanups

Cleanup imports in mitogen, ansible_mitogen, & tests

.ci/ansible_tests.py

@@ -7,7 +7,6 @@ import signal
 import sys
 
 import ci_lib
-from ci_lib import run
 
 
 TESTS_DIR = os.path.join(ci_lib.GIT_ROOT, 'tests/ansible')
@@ -40,10 +39,10 @@ with ci_lib.Fold('job_setup'):
     os.chdir(TESTS_DIR)
     os.chmod('../data/docker/mitogen__has_sudo_pubkey.key', int('0600', 7))
 
-    run("mkdir %s", HOSTS_DIR)
+    ci_lib.run("mkdir %s", HOSTS_DIR)
     for path in glob.glob(TESTS_DIR + '/hosts/*'):
         if not path.endswith('default.hosts'):
-            run("ln -s %s %s", path, HOSTS_DIR)
+            ci_lib.run("ln -s %s %s", path, HOSTS_DIR)
 
     inventory_path = os.path.join(HOSTS_DIR, 'target')
     with open(inventory_path, 'w') as fp:
@@ -63,14 +62,14 @@ with ci_lib.Fold('job_setup'):
     ci_lib.dump_file(inventory_path)
 
     if not ci_lib.exists_in_path('sshpass'):
-        run("sudo apt-get update")
+        ci_lib.run("sudo apt-get update")
-        run("sudo apt-get install -y sshpass")
+        ci_lib.run("sudo apt-get install -y sshpass")
 
 
 with ci_lib.Fold('ansible'):
     playbook = os.environ.get('PLAYBOOK', 'all.yml')
     try:
-        run('./run_ansible_playbook.py %s -i "%s" %s',
+        ci_lib.run('./run_ansible_playbook.py %s -i "%s" %s',
             playbook, HOSTS_DIR, ' '.join(sys.argv[1:]))
     except:
         pause_if_interactive()

.ci/ci_lib.py

@@ -1,4 +1,3 @@
-
 from __future__ import absolute_import
 from __future__ import print_function
 

.ci/localhost_ansible_tests.py

@@ -6,7 +6,6 @@ import subprocess
 import sys
 
 import ci_lib
-from ci_lib import run
 
 
 TESTS_DIR = os.path.join(ci_lib.GIT_ROOT, 'tests/ansible')
@@ -52,11 +51,11 @@ with ci_lib.Fold('machine_prep'):
 
     if os.path.expanduser('~mitogen__user1') == '~mitogen__user1':
         os.chdir(IMAGE_PREP_DIR)
-        run("ansible-playbook -c local -i localhost, _user_accounts.yml")
+        ci_lib.run("ansible-playbook -c local -i localhost, _user_accounts.yml")
 
 
 with ci_lib.Fold('ansible'):
     os.chdir(TESTS_DIR)
     playbook = os.environ.get('PLAYBOOK', 'all.yml')
-    run('./run_ansible_playbook.py %s -l target %s',
+    ci_lib.run('./run_ansible_playbook.py %s -l target %s',
         playbook, ' '.join(sys.argv[1:]))

ansible_mitogen/affinity.py

@@ -73,7 +73,9 @@ necessarily involves preventing the scheduler from making load balancing
 decisions.
 """
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import ctypes
 import logging
 import mmap

ansible_mitogen/connection.py

@@ -26,8 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
 from __future__ import unicode_literals
+__metaclass__ = type
 
 import errno
 import logging
@@ -40,10 +41,8 @@ import time
 import ansible.constants as C
 import ansible.errors
 import ansible.plugins.connection
-import ansible.utils.shlex
 
 import mitogen.core
-import mitogen.fork
 import mitogen.utils
 
 import ansible_mitogen.mixins
@@ -1097,7 +1096,7 @@ class Connection(ansible.plugins.connection.ConnectionBase):
                     s = fp.read(self.SMALL_FILE_LIMIT + 1)
                 finally:
                     fp.close()
-            except OSError:
+            except OSError as e:
                 self._throw_io_error(e, in_path)
                 raise
 

ansible_mitogen/loaders.py

@@ -30,7 +30,10 @@
 Stable names for PluginLoader instances across Ansible versions.
 """
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
+import ansible.errors
 
 import ansible_mitogen.utils
 

ansible_mitogen/logging.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import logging
 import os
 
@@ -36,8 +38,8 @@ import mitogen.utils
 try:
     from __main__ import display
 except ImportError:
-    from ansible.utils.display import Display
+    import ansible.utils.display
-    display = Display()
+    display = ansible.utils.display.Display()
 
 
 #: The process name set via :func:`set_process_name`.

ansible_mitogen/mixins.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import logging
 import os
 import pwd

ansible_mitogen/module_finder.py

@@ -26,8 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
 from __future__ import unicode_literals
+__metaclass__ = type
 
 import collections
 import imp

ansible_mitogen/parsing.py

@@ -26,8 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
 from __future__ import unicode_literals
+__metaclass__ = type
 
 import mitogen.core
 

ansible_mitogen/planner.py

@@ -34,8 +34,9 @@ files/modules known missing.
 [0] "Ansible Module Architecture", developing_program_flow_modules.html
 """
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
 from __future__ import unicode_literals
+__metaclass__ = type
 
 import json
 import logging
@@ -43,11 +44,10 @@ import os
 import random
 import re
 
-from ansible.executor import module_common
+import ansible.collections.list
-from ansible.collections.list import list_collection_dirs
 import ansible.errors
-import ansible.module_utils
+import ansible.executor.module_common
-import ansible.release
+
 import mitogen.core
 import mitogen.select
 
@@ -192,7 +192,7 @@ class BinaryPlanner(Planner):
 
     @classmethod
     def detect(cls, path, source):
-        return module_common._is_binary(source)
+        return ansible.executor.module_common._is_binary(source)
 
     def get_push_files(self):
         return [mitogen.core.to_text(self._inv.module_path)]
@@ -269,7 +269,7 @@ class JsonArgsPlanner(ScriptPlanner):
 
     @classmethod
     def detect(cls, path, source):
-        return module_common.REPLACER_JSONARGS in source
+        return ansible.executor.module_common.REPLACER_JSONARGS in source
 
 
 class WantJsonPlanner(ScriptPlanner):
@@ -298,11 +298,11 @@ class NewStylePlanner(ScriptPlanner):
     preprocessing the module.
     """
     runner_name = 'NewStyleRunner'
-    MARKER = re.compile(b'from ansible(?:_collections|\.module_utils)\.')
+    MARKER = re.compile(br'from ansible(?:_collections|\.module_utils)\.')
 
     @classmethod
     def detect(cls, path, source):
-        return cls.MARKER.search(source) != None
+        return cls.MARKER.search(source) is not None
 
     def _get_interpreter(self):
         return None, None
@@ -362,7 +362,7 @@ class NewStylePlanner(ScriptPlanner):
                 module_name='ansible_module_%s' % (self._inv.module_name,),
                 module_path=self._inv.module_path,
                 search_path=self.get_search_path(),
-                builtin_path=module_common._MODULE_UTILS_PATH,
+                builtin_path=ansible.executor.module_common._MODULE_UTILS_PATH,
                 context=self._inv.connection.context,
             )
         return self._module_map
@@ -405,7 +405,7 @@ class ReplacerPlanner(NewStylePlanner):
 
     @classmethod
     def detect(cls, path, source):
-        return module_common.REPLACER in source
+        return ansible.executor.module_common.REPLACER in source
 
 
 class OldStylePlanner(ScriptPlanner):
@@ -427,12 +427,6 @@ _planners = [
 ]
 
 
-try:
-    _get_ansible_module_fqn = module_common._get_ansible_module_fqn
-except AttributeError:
-    _get_ansible_module_fqn = None
-
-
 def py_modname_from_path(name, path):
     """
     Fetch the logical name of a new-style module as it might appear in
@@ -442,11 +436,12 @@ def py_modname_from_path(name, path):
       package hierarchy approximated on the target, enabling relative imports
       to function correctly. For example, "ansible.modules.system.setup".
     """
-    if _get_ansible_module_fqn:
+    try:
-        try:
+        return ansible.executor.module_common._get_ansible_module_fqn(path)
-            return _get_ansible_module_fqn(path)
+    except AttributeError:
-        except ValueError:
+        pass
-            pass
+    except ValueError:
+        pass
 
     return 'ansible.modules.' + name
 
@@ -528,12 +523,15 @@ def _invoke_isolated_task(invocation, planner):
         context.shutdown()
 
 
-def _get_planner(name, path, source):
+def _get_planner(invocation, source):
     for klass in _planners:
-        if klass.detect(path, source):
+        if klass.detect(invocation.module_path, source):
-            LOG.debug('%r accepted %r (filename %r)', klass, name, path)
+            LOG.debug(
+                '%r accepted %r (filename %r)',
+                klass, invocation.module_name, invocation.module_path,
+            )
             return klass
-        LOG.debug('%r rejected %r', klass, name)
+        LOG.debug('%r rejected %r', klass, invocation.module_name)
     raise ansible.errors.AnsibleError(NO_METHOD_MSG + repr(invocation))
 
 
@@ -564,7 +562,7 @@ def _load_collections(invocation):
     Goes through all collection path possibilities and stores paths to installed collections
     Stores them on the current invocation to later be passed to the master service
     """
-    for collection_path in list_collection_dirs():
+    for collection_path in ansible.collections.list.list_collection_dirs():
         invocation._extra_sys_paths.add(collection_path.decode('utf-8'))
 
 
@@ -596,8 +594,7 @@ def invoke(invocation):
         module_source = invocation.get_module_source()
         _fix_py35(invocation, module_source)
         _planner_by_path[invocation.module_path] = _get_planner(
-            invocation.module_name,
+            invocation,
-            invocation.module_path,
             module_source
         )
 

ansible_mitogen/plugins/action/mitogen_get_stack.py

@@ -26,14 +26,15 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 """
 Fetch the connection configuration stack that would be used to connect to a
 target, without actually connecting to it.
 """
 
+from __future__ import absolute_import, division, print_function
+from __future__ import unicode_literals
+__metaclass__ = type
+
 import ansible_mitogen.connection
 
 from ansible.plugins.action import ActionBase

ansible_mitogen/plugins/connection/mitogen_buildah.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import os.path
 import sys
 

ansible_mitogen/plugins/connection/mitogen_doas.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import os.path
 import sys
 

ansible_mitogen/plugins/connection/mitogen_docker.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import os.path
 import sys
 

ansible_mitogen/plugins/connection/mitogen_jail.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import os.path
 import sys
 

ansible_mitogen/plugins/connection/mitogen_kubectl.py

@@ -27,12 +27,13 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import os.path
 import sys
 
-from ansible.errors import AnsibleConnectionFailure
+import ansible.errors
-from ansible.module_utils.six import iteritems
 
 try:
     import ansible_mitogen
@@ -61,7 +62,7 @@ class Connection(ansible_mitogen.connection.Connection):
 
     def __init__(self, *args, **kwargs):
         if not _get_result:
-            raise AnsibleConnectionFailure(self.not_supported_msg)
+            raise ansible.errors.AnsibleConnectionFailure(self.not_supported_msg)
         super(Connection, self).__init__(*args, **kwargs)
 
     def get_extra_args(self):
@@ -72,8 +73,10 @@ class Connection(ansible_mitogen.connection.Connection):
             # Ansible >= 2.10, _get_result is a get_with_context_result
             connection_options = _get_result.object.connection_options
         parameters = []
-        for key, option in iteritems(connection_options):
+        for key in connection_options:
-            if self.get_task_var('ansible_' + key) is not None:
+            task_var_name = 'ansible_%s' % key
-                parameters += [ option, self.get_task_var('ansible_' + key) ]
+            task_var = self.get_task_var(task_var_name)
+            if task_var is not None:
+                parameters += [connection_options[key], task_var]
 
         return parameters

ansible_mitogen/plugins/connection/mitogen_local.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import os.path
 import sys
 

ansible_mitogen/plugins/connection/mitogen_lxc.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import os.path
 import sys
 

ansible_mitogen/plugins/connection/mitogen_lxd.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import os.path
 import sys
 

ansible_mitogen/plugins/connection/mitogen_machinectl.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import os.path
 import sys
 

ansible_mitogen/plugins/connection/mitogen_podman.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import os.path
 import sys
 

ansible_mitogen/plugins/connection/mitogen_setns.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import os.path
 import sys
 

ansible_mitogen/plugins/connection/mitogen_ssh.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import os.path
 import sys
 

ansible_mitogen/plugins/connection/mitogen_su.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import os.path
 import sys
 

ansible_mitogen/plugins/connection/mitogen_sudo.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import os.path
 import sys
 

ansible_mitogen/plugins/strategy/mitogen.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import os.path
 import sys
 

ansible_mitogen/plugins/strategy/mitogen_free.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import os.path
 import sys
 

ansible_mitogen/plugins/strategy/mitogen_host_pinned.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import os.path
 import sys
 

ansible_mitogen/plugins/strategy/mitogen_linear.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import os.path
 import sys
 

ansible_mitogen/process.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import atexit
 import logging
 import multiprocessing

ansible_mitogen/runner.py

@@ -36,6 +36,9 @@ Each class in here has a corresponding Planner class in planners.py that knows
 how to build arguments for it, preseed related data, etc.
 """
 
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import atexit
 import imp
 import os

ansible_mitogen/services.py

@@ -39,18 +39,18 @@ connections, grant access to files by children, and register for notification
 when a child has completed a job.
 """
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
 from __future__ import unicode_literals
+__metaclass__ = type
 
 import logging
 import os
-import os.path
 import sys
 import threading
 
 import ansible.constants
 
-import mitogen
+import mitogen.core
 import mitogen.service
 import mitogen.utils
 import ansible_mitogen.loaders

ansible_mitogen/strategy.py

@@ -26,7 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import os
 import signal
 import threading
@@ -43,7 +45,7 @@ import ansible_mitogen.mixins
 import ansible_mitogen.process
 
 import ansible.executor.process.worker
-from ansible.utils.sentinel import Sentinel
+import ansible.utils.sentinel
 
 
 def _patch_awx_callback():
@@ -54,12 +56,11 @@ def _patch_awx_callback():
     # AWX uses sitecustomize.py to force-load this package. If it exists, we're
     # running under AWX.
     try:
-        from awx_display_callback.events import EventContext
+        import awx_display_callback.events
-        from awx_display_callback.events import event_context
     except ImportError:
         return
 
-    if hasattr(EventContext(), '_local'):
+    if hasattr(awx_display_callback.events.EventContext(), '_local'):
         # Patched version.
         return
 
@@ -68,8 +69,8 @@ def _patch_awx_callback():
         ctx = tls.setdefault('_ctx', {})
         ctx.update(kwargs)
 
-    EventContext._local = threading.local()
+    awx_display_callback.events.EventContext._local = threading.local()
-    EventContext.add_local = patch_add_local
+    awx_display_callback.events.EventContext.add_local = patch_add_local
 
 _patch_awx_callback()
 
@@ -279,7 +280,7 @@ class StrategyMixin(object):
             name=task.action,
             class_only=True,
         )
-        if play_context.connection is not Sentinel:
+        if play_context.connection is not ansible.utils.sentinel.Sentinel:
             # 2.8 appears to defer computing this until inside the worker.
             # TODO: figure out where it has moved.
             ansible_mitogen.loaders.connection_loader.get(

ansible_mitogen/target.py

@@ -33,6 +33,9 @@ Helper functions intended to be executed on the target. These are entrypoints
 for file transfer, module execution and sundry bits like changing file modes.
 """
 
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
 import errno
 import grp
 import operator
@@ -51,7 +54,6 @@ import types
 logging = __import__('logging')
 
 import mitogen.core
-import mitogen.fork
 import mitogen.parent
 import mitogen.service
 from mitogen.core import b

ansible_mitogen/transport_config.py

@@ -26,9 +26,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 """
 Mitogen extends Ansible's target configuration mechanism in several ways that
 require some care:
@@ -60,6 +57,10 @@ information from PlayContext, and another that takes (almost) all information
 from HostVars.
 """
 
+from __future__ import absolute_import, division, print_function
+from __future__ import unicode_literals
+__metaclass__ = type
+
 import abc
 import os
 import ansible.utils.shlex

ansible_mitogen/utils.py

@@ -1,4 +1,5 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
 
 import distutils.version
 

mitogen/buildah.py

@@ -30,7 +30,6 @@
 
 import logging
 
-import mitogen.core
 import mitogen.parent
 
 

mitogen/core.py

@@ -2717,7 +2717,7 @@ class Latch(object):
                 raise e
 
             assert cookie == got_cookie, (
-                "Cookie incorrect; got %r, expected %r" \
+                "Cookie incorrect; got %r, expected %r"
                 % (binascii.hexlify(got_cookie),
                    binascii.hexlify(cookie))
             )
@@ -3672,7 +3672,6 @@ class Dispatcher(object):
             self._service_recv.notify = None
         self.recv.close()
 
-
     @classmethod
     @takes_econtext
     def forget_chain(cls, chain_id, econtext):

mitogen/fakessh.py

@@ -103,7 +103,6 @@ import tempfile
 import threading
 
 import mitogen.core
-import mitogen.master
 import mitogen.parent
 
 from mitogen.core import LOG, IOLOG
@@ -200,7 +199,7 @@ class Process(object):
 
     def _on_stdin(self, msg):
         if msg.is_dead:
-            IOLOG.debug('%r._on_stdin() -> %r', self, data)
+            IOLOG.debug('%r._on_stdin() -> %r', self, msg)
             self.pump.protocol.close()
             return
 
@@ -437,7 +436,7 @@ def run(dest, router, args, deadline=None, econtext=None):
             fp.write(inspect.getsource(mitogen.core))
             fp.write('\n')
             fp.write('ExternalContext(%r).main()\n' % (
-                _get_econtext_config(context, sock2),
+                _get_econtext_config(econtext, sock2),
             ))
         finally:
             fp.close()

mitogen/kubectl.py

@@ -28,7 +28,6 @@
 
 # !mitogen: minify_safe
 
-import mitogen.core
 import mitogen.parent
 
 

mitogen/lxc.py

@@ -28,7 +28,6 @@
 
 # !mitogen: minify_safe
 
-import mitogen.core
 import mitogen.parent
 
 

mitogen/lxd.py

@@ -28,7 +28,6 @@
 
 # !mitogen: minify_safe
 
-import mitogen.core
 import mitogen.parent
 
 

mitogen/parent.py

@@ -1508,7 +1508,7 @@ class Connection(object):
 
     def get_preamble(self):
         suffix = (
-            '\nExternalContext(%r).main()\n' %\
+            '\nExternalContext(%r).main()\n' %
             (self.get_econtext_config(),)
         )
         partial = get_core_source_partial()

mitogen/podman.py

@@ -31,7 +31,6 @@
 
 import logging
 
-import mitogen.core
 import mitogen.parent
 
 

mitogen/service.py

@@ -31,7 +31,6 @@
 import grp
 import logging
 import os
-import os.path
 import pprint
 import pwd
 import stat

mitogen/utils.py

@@ -33,10 +33,8 @@ import logging
 import os
 import sys
 
-import mitogen
 import mitogen.core
 import mitogen.master
-import mitogen.parent
 
 
 iteritems = getattr(dict, 'iteritems', dict.items)

tests/ansible/integration/module_utils/roles/modrole/module_utils/external2.py

@@ -1,3 +1,2 @@
-
 def path():
     return "integration/module_utils/roles/modrole/module_utils/external2.py"

tests/ansible/integration/module_utils/roles/overrides_modrole/library/uses_custom_known_hosts.py

@@ -1,11 +1,11 @@
 #!/usr/bin/python
 
 import json
-from ansible.module_utils.basic import path
+import ansible.module_utils.basic
 
 def main():
     print(json.dumps({
-        'path': path()
+        'path': ansible.module_utils.basic.path()
     }))
 
 if __name__ == '__main__':

tests/ansible/integration/runner/atexit.yml

@@ -17,7 +17,7 @@
 
     - custom_python_run_script:
         script: |
-          import atexit, shutil
+          import atexit, os, shutil
           path = '{{path}}'
           os.mkdir(path, int('777', 8))
           atexit.register(shutil.rmtree, path)

tests/ansible/lib/action/action_passthrough.py

@@ -1,8 +1,5 @@
-
 import traceback
-import sys
 
-from ansible.plugins.strategy import StrategyBase
 from ansible.plugins.action import ActionBase
 
 

tests/ansible/lib/action/connection_passthrough.py

@@ -1,8 +1,5 @@
-
 import traceback
-import sys
 
-from ansible.plugins.strategy import StrategyBase
 from ansible.plugins.action import ActionBase
 
 

tests/ansible/lib/action/determine_strategy.py

@@ -1,4 +1,3 @@
-
 import sys
 
 from ansible.plugins.strategy import StrategyBase

tests/ansible/lib/action/mitogen_shutdown_all.py

@@ -5,9 +5,7 @@ required for reliable LRU tests.
 
 import ansible_mitogen.connection
 import ansible_mitogen.services
-import mitogen.service
 
-from ansible.plugins.strategy import StrategyBase
 from ansible.plugins.action import ActionBase
 
 

tests/ansible/lib/callback/fork_histogram.py

@@ -1,4 +1,3 @@
-
 # Monkey-patch os.fork() to produce a latency histogram on run completion.
 # Requires 'hdrhsitograms' PyPI module.
 

tests/ansible/lib/callback/nice_stdout.py

@@ -1,7 +1,6 @@
 from __future__ import unicode_literals
 import io
 import os
-import sys
 
 from ansible import constants as C
 from ansible.module_utils import six

tests/ansible/lib/filters/mitogen_tests.py

@@ -1,4 +1,3 @@
-
 from ansible.module_utils._text import to_text
 
 

tests/ansible/lib/module_utils/external2.py

@@ -1,3 +1,2 @@
-
 def path():
     return "ansible/lib/module_utils/external2.py"

tests/ansible/lib/module_utils/externalpkg/extmod.py

@@ -1,3 +1,2 @@
-
 def path():
     return 'ansible/lib/module_utils/externalpkg/extmod.py'

tests/ansible/lib/modules/custom_python_detect_environment.py

@@ -4,7 +4,6 @@
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.basic import get_module_path
-from ansible.module_utils import six
 
 import os
 import pwd

tests/ansible/lib/modules/custom_python_json_args_module.py

@@ -1,8 +1,6 @@
 #!/usr/bin/python
 # I am an Ansible Python JSONARGS module. I should receive an encoding string.
 
-import sys
-
 json_arguments = """<<INCLUDE_ANSIBLE_MODULE_JSON_ARGS>>"""
 
 print("{")

tests/ansible/lib/modules/custom_python_modify_environ.py

@@ -5,9 +5,6 @@
 from ansible.module_utils.basic import AnsibleModule
 
 import os
-import pwd
-import socket
-import sys
 
 
 def main():

tests/ansible/lib/modules/custom_python_prehistoric_module.py

@@ -2,13 +2,6 @@
 # issue #555: I'm a module that cutpastes an old hack.
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.basic import get_module_path
-from ansible.module_utils import six
-
-import os
-import pwd
-import socket
-import sys
 
 import sys
 reload(sys)

tests/ansible/lib/modules/custom_python_run_script.py

@@ -3,12 +3,7 @@
 # parameter.
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.basic import get_module_path
-from ansible.module_utils import six
 
-import os
-import pwd
-import socket
 import sys
 
 

tests/ansible/tests/affinity_test.py

@@ -1,4 +1,3 @@
-
 import multiprocessing
 import os
 import sys

tests/ansible/tests/connection_test.py

@@ -1,17 +1,12 @@
-
 from __future__ import absolute_import
 import os
-import os.path
-import subprocess
 import tempfile
-import time
 
 import mock
 import ansible.errors
 import ansible.playbook.play_context
 
 import mitogen.core
-import mitogen.utils
 
 import ansible_mitogen.connection
 import ansible_mitogen.plugins.connection.mitogen_local
@@ -25,7 +20,6 @@ class MuxProcessMixin(object):
 
     @classmethod
     def setUpClass(cls):
-        #mitogen.utils.log_to_file()
         cls.model = ansible_mitogen.process.get_classic_worker_model(
             _init_logging=False
         )

tests/ansible/tests/env_file_watcher_test.py

@@ -1,5 +1,4 @@
 import os
-import sys
 import tempfile
 
 import testlib

tests/ansible/tests/target_test.py

@@ -1,4 +1,3 @@
-
 from __future__ import absolute_import
 import os.path
 import subprocess

tests/bench/large_messages.py

@@ -1,10 +1,5 @@
-
 # Verify _receive_one() quadratic behaviour fixed.
 
-import subprocess
-import time
-import socket
-
 import mitogen
 import mitogen.core
 

tests/bench/latch_roundtrip.py

@@ -3,9 +3,7 @@ Measure latency of IPC between two local threads.
 """
 
 import threading
-import time
 
-import mitogen
 import mitogen.core
 import mitogen.utils
 import ansible_mitogen.affinity

tests/bench/local.py

@@ -2,8 +2,6 @@
 Measure latency of .local() setup.
 """
 
-import time
-
 import mitogen
 import mitogen.core
 import mitogen.utils

tests/bench/megatime.py

@@ -2,7 +2,6 @@
 
 import sys
 import os
-import time
 
 import mitogen.core
 

tests/bench/roundtrip.py

@@ -2,9 +2,6 @@
 Measure latency of local RPC.
 """
 
-import time
-
-import mitogen
 import mitogen.core
 import mitogen.utils
 import ansible_mitogen.affinity

tests/bench/service.py

@@ -1,9 +1,6 @@
 """
 Measure latency of local service RPC.
 """
-
-import time
-
 import mitogen
 import mitogen.core
 import mitogen.service

tests/bench/ssh-roundtrip.py

@@ -3,9 +3,7 @@ Measure latency of SSH RPC.
 """
 
 import sys
-import time
 
-import mitogen
 import mitogen.core
 import mitogen.utils
 import ansible_mitogen.affinity

tests/bench/throughput.py

@@ -1,11 +1,7 @@
 # Verify throughput over sudo and SSH at various compression levels.
 
 import os
-import random
-import socket
-import subprocess
 import tempfile
-import time
 
 import mitogen
 import mitogen.core

tests/buildah_test.py

@@ -1,7 +1,5 @@
 import os
 
-import mitogen
-
 import testlib
 
 

tests/call_function_test.py

@@ -1,9 +1,7 @@
-import logging
 import time
 
 import mitogen.core
 import mitogen.parent
-import mitogen.master
 from mitogen.core import str_partition
 
 import testlib

tests/connection_test.py

@@ -1,4 +1,3 @@
-
 import os
 import signal
 import sys

tests/context_test.py

@@ -1,4 +1,3 @@
-
 import pickle
 
 import mitogen.core

tests/create_child_test.py

@@ -1,9 +1,7 @@
-
 import fcntl
 import os
 import stat
 import sys
-import time
 import tempfile
 
 import mitogen.core

tests/data/importer/module_finder_testmod/regular_mod.py

@@ -1,6 +1,2 @@
-
-import sys
-
-
 def say_hi():
     print('hi')

tests/data/importer/module_finder_testmod/sibling_dep_mod_abs_import.py

@@ -1,3 +1,2 @@
-
 from __future__ import absolute_import
 from module_finder_testmod.regular_mod import say_hi

tests/data/importer/module_finder_testmod/sibling_dep_mod_py2_import.py

@@ -1,2 +1 @@
-
 from regular_mod import say_hi

tests/data/importer/pkg_like_plumbum/colors.py

@@ -1,4 +1,3 @@
-
 # coding=utf-8
 
 import sys

tests/data/importer/simple_pkg/a.py

@@ -1,4 +1,3 @@
-
 import simple_pkg.b
 
 

tests/data/importer/simple_pkg/b.py

@@ -1,3 +1,2 @@
-
 def subtract_one(n):
     return n - 1

tests/data/importer/simple_pkg/ping.py

@@ -1,5 +1,3 @@
-
-
 def ping(*args):
     return args
 

tests/data/importer/webproject/serve_django_app.py

@@ -1,4 +1,3 @@
-
 import os
 import sys
 

tests/data/main_with_no_exec_guard.py

@@ -1,4 +1,3 @@
-
 import logging
 import mitogen.master
 

tests/data/stubs/stub-python.py

@@ -2,7 +2,6 @@
 
 import json
 import os
-import subprocess
 import sys
 
 os.environ['ORIGINAL_ARGV'] = json.dumps(sys.argv)

tests/data/stubs/stub-su.py

@@ -2,7 +2,6 @@
 
 import json
 import os
-import subprocess
 import sys
 import time
 

tests/doas_test.py

@@ -1,9 +1,7 @@
-
 import os
 
-import mitogen
+import mitogen.core
 import mitogen.doas
-import mitogen.parent
 
 import testlib
 

tests/docker_test.py

@@ -1,7 +1,5 @@
 import os
 
-import mitogen
-
 import testlib
 
 

tests/fakessh_test.py

@@ -1,4 +1,3 @@
-
 import os
 import shutil
 import unittest

tests/file_service_test.py

@@ -1,4 +1,3 @@
-
 import sys
 
 import mitogen.service

tests/first_stage_test.py

@@ -1,4 +1,3 @@
-
 import subprocess
 
 import mitogen.parent

tests/fork_test.py

@@ -1,7 +1,5 @@
-
 import os
 import random
-import struct
 import sys
 import unittest
 

tests/importer_test.py

@@ -1,4 +1,3 @@
-
 import sys
 import threading
 import types

tests/io_op_test.py

@@ -1,4 +1,3 @@
-
 import errno
 import select