Merge pull request #1266 from moreati/imports-cleanup

Imports cleanup

ansible_mitogen/connection.py

@@ -43,11 +43,11 @@ import ansible.errors
 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 os
 
 import ansible.utils.display
 
-import mitogen.core
 import mitogen.utils
 
 

ansible_mitogen/planner.py

@@ -50,6 +50,7 @@ import ansible.executor.module_common
 
 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 @@ except ImportError:
 import mitogen.core
 import ansible_mitogen.affinity
 import ansible_mitogen.loaders
+import ansible_mitogen.logging
 import ansible_mitogen.mixins
 import ansible_mitogen.process
 

docs/changelog.rst

@@ -21,6 +21,8 @@ To avail of fixes in an unreleased version, please download a ZIP file
 In progress (unreleased)
 ------------------------
 
+* :gh:issue:`1266` Import cleanups
+
 
 v0.3.29 (2025-09-18)
 --------------------

mitogen/__init__.py

@@ -106,7 +106,8 @@ def main(log_level='INFO', profiling=_default_profiling):
     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/fakessh.py

@@ -97,7 +97,6 @@ import inspect
 import os
 import pty
 import shutil
-import socket
 import subprocess
 import sys
 import tempfile

mitogen/ssh.py

@@ -40,6 +40,7 @@ try:
 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 sys
 import tempfile
 
 import mitogen.core
+import mitogen.parent
 import mitogen.master
 
 

tests/context_test.py

@@ -1,7 +1,6 @@
 import pickle
 
 import mitogen.core
-from mitogen.core import b
 
 import testlib
 

tests/poller_test.py

@@ -1,7 +1,6 @@
 import errno
 import os
 import select
-import socket
 import sys
 import unittest