From 6774e08aa46dc2d368876e37a063a4b785ede67b Mon Sep 17 00:00:00 2001 From: David Murphy Date: Tue, 30 Jul 2024 10:36:57 -0600 Subject: [PATCH] Remove psutil_compat.py file, which should have been removed when RHEL 6 EOL --- salt/utils/psutil_compat.py | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 salt/utils/psutil_compat.py diff --git a/salt/utils/psutil_compat.py b/salt/utils/psutil_compat.py deleted file mode 100644 index a2ac44e2ae9..00000000000 --- a/salt/utils/psutil_compat.py +++ /dev/null @@ -1,21 +0,0 @@ -""" -Version agnostic psutil hack to fully support both old (<2.0) and new (>=2.0) -psutil versions. - -The old <1.0 psutil API is dropped in psutil 3.0 - -Should be removed once support for psutil <2.0 is dropped. (eg RHEL 6) - -Built off of http://grodola.blogspot.com/2014/01/psutil-20-porting.html -""" - -from psutil import * # pylint: disable=wildcard-import,unused-wildcard-import,3rd-party-module-not-gated - -import salt.utils.versions - -salt.utils.versions.warn_until( - 3008, - "Please stop importing 'salt.utils.psutil_compat' and instead import " - "'psutil' directly as there's no longer a need for a compatability " - "layer. The 'salt.utils.psutil_compat' will go away on Salt {version}.", -)