From 7d5f63ccbf30c3925fd1888c6a24e5307a5b1d7c Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Wed, 28 May 2025 13:30:54 +0100
Subject: [PATCH] Cleanup unused and missing imports

---
 ansible_mitogen/connection.py | 4 ++--
 ansible_mitogen/logging.py    | 1 -
 ansible_mitogen/planner.py    | 1 +
 ansible_mitogen/strategy.py   | 1 +
 docs/changelog.rst            | 2 ++
 mitogen/__init__.py           | 3 ++-
 mitogen/fakessh.py            | 1 -
 mitogen/ssh.py                | 1 +
 mitogen/unix.py               | 1 +
 tests/context_test.py         | 1 -
 tests/poller_test.py          | 1 -
 11 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ansible_mitogen/connection.py b/ansible_mitogen/connection.py
index 5b9ae70b2..9afb3de0c 100644
--- a/ansible_mitogen/connection.py
+++ b/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
diff --git a/ansible_mitogen/logging.py b/ansible_mitogen/logging.py
index 4d5647a45..70a8f15f4 100644
--- a/ansible_mitogen/logging.py
+++ b/ansible_mitogen/logging.py
@@ -34,7 +34,6 @@
 
 import ansible.utils.display
 
-import mitogen.core
 import mitogen.utils
 
 
diff --git a/ansible_mitogen/planner.py b/ansible_mitogen/planner.py
index b4c9d9b8f..5d11de3e3 100644
--- a/ansible_mitogen/planner.py
+++ b/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
diff --git a/ansible_mitogen/strategy.py b/ansible_mitogen/strategy.py
index 9408ca636..c0b2ef87d 100644
--- a/ansible_mitogen/strategy.py
+++ b/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
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index a5017820e..15fb42725 100644
--- a/docs/changelog.rst
+++ b/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)
 --------------------
diff --git a/mitogen/__init__.py b/mitogen/__init__.py
index 2f6260530..22f0e9cfa 100644
--- a/mitogen/__init__.py
+++ b/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()
diff --git a/mitogen/fakessh.py b/mitogen/fakessh.py
index 235999031..70eacac76 100644
--- a/mitogen/fakessh.py
+++ b/mitogen/fakessh.py
@@ -97,7 +97,6 @@
 import os
 import pty
 import shutil
-import socket
 import subprocess
 import sys
 import tempfile
diff --git a/mitogen/ssh.py b/mitogen/ssh.py
index f32d2cabb..c43d00da8 100644
--- a/mitogen/ssh.py
+++ b/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
 
diff --git a/mitogen/unix.py b/mitogen/unix.py
index 84eedc4bb..71b98efde 100644
--- a/mitogen/unix.py
+++ b/mitogen/unix.py
@@ -44,6 +44,7 @@
 import tempfile
 
 import mitogen.core
+import mitogen.parent
 import mitogen.master
 
 
diff --git a/tests/context_test.py b/tests/context_test.py
index ee9292c46..b9652c14c 100644
--- a/tests/context_test.py
+++ b/tests/context_test.py
@@ -1,7 +1,6 @@
 import pickle
 
 import mitogen.core
-from mitogen.core import b
 
 import testlib
 
diff --git a/tests/poller_test.py b/tests/poller_test.py
index 01e4a5618..ae7d2965c 100644
--- a/tests/poller_test.py
+++ b/tests/poller_test.py
@@ -1,7 +1,6 @@
 import errno
 import os
 import select
-import socket
 import sys
 import unittest