From 4d372cb160b28cef260ba9d0423b2af9356d38ee Mon Sep 17 00:00:00 2001 From: Alex Willmer Date: Tue, 13 Jan 2026 15:45:30 +0000 Subject: [PATCH] mitogen: Last few `except ImportError` -> `if sys.version_info ...` --- ansible_mitogen/process.py | 4 ++-- docs/changelog.rst | 3 +++ mitogen/master.py | 9 ++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ansible_mitogen/process.py b/ansible_mitogen/process.py index 897ef4f0..5ef03c46 100644 --- a/ansible_mitogen/process.py +++ b/ansible_mitogen/process.py @@ -38,9 +38,9 @@ import socket import signal import sys -try: +if sys.version_info >= (3, 3): import faulthandler -except ImportError: +else: faulthandler = None try: diff --git a/docs/changelog.rst b/docs/changelog.rst index 6be75a42..95131afb 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -21,6 +21,9 @@ To avail of fixes in an unreleased version, please download a ZIP file In progress (unreleased) ------------------------ +* :gh:issue:`1415` :mod:`mitogen`: Put fallbacks & polyfills into + ``if sys.version_info`` blocks + v0.3.37 (2026-01-08) -------------------- diff --git a/mitogen/master.py b/mitogen/master.py index d864ae6f..03c89771 100644 --- a/mitogen/master.py +++ b/mitogen/master.py @@ -68,15 +68,14 @@ else: import imp from imp import is_builtin as _is_builtin - try: + if sys.version_info >= (2, 5): from pkgutil import find_loader as _find_loader - except ImportError: - # Python < 2.5 + else: from mitogen.compat.pkgutil import find_loader as _find_loader -try: +if sys.version_info >= (2, 7): import sysconfig -except ImportError: +else: sysconfig = None import mitogen