Imports cleanup

ansible_mitogen/connection.py

@@ -43,11 +43,11 @@
 import ansible.plugins.connection
 
 import mitogen.core
+import mitogen.parent
+import mitogen.service
 
 import ansible_mitogen.mixins
-import ansible_mitogen.parsing
 import ansible_mitogen.process
-import ansible_mitogen.services
 import ansible_mitogen.target
 import ansible_mitogen.transport_config
 import ansible_mitogen.utils.unsafe

ansible_mitogen/logging.py

@@ -34,7 +34,6 @@
 
 import ansible.utils.display
 
-import mitogen.core
 import mitogen.utils
 
 

ansible_mitogen/planner.py

@@ -50,6 +50,7 @@
 
 import mitogen.core
 import mitogen.select
+import mitogen.service
 
 import ansible_mitogen.loaders
 import ansible_mitogen.parsing

ansible_mitogen/strategy.py

@@ -41,6 +41,7 @@
 import mitogen.core
 import ansible_mitogen.affinity
 import ansible_mitogen.loaders
+import ansible_mitogen.logging
 import ansible_mitogen.mixins
 import ansible_mitogen.process
 

mitogen/__init__.py

@@ -106,7 +106,8 @@ def main(router):
     def wrapper(func):
         if func.__module__ != '__main__':
             return func
-        import mitogen.parent
+        import mitogen.core
+        import mitogen.master
         import mitogen.utils
         if profiling:
             mitogen.core.enable_profiling()

mitogen/os_fork.py

@@ -38,6 +38,7 @@
 import weakref
 
 import mitogen.core
+import mitogen.parent
 
 
 # List of weakrefs. On Python 2.4, mitogen.core registers its Broker on this

mitogen/ssh.py

@@ -40,6 +40,7 @@
 except ImportError:
     from pipes import quote as shlex_quote
 
+import mitogen.core
 import mitogen.parent
 from mitogen.core import b
 

mitogen/unix.py

@@ -44,6 +44,7 @@
 import tempfile
 
 import mitogen.core
+import mitogen.parent
 import mitogen.master