From fb8dbf856d932d0db858741e85f03d2388fb93fa Mon Sep 17 00:00:00 2001
From: dosas <dosas@users.noreply.github.com>
Date: Tue, 10 Dec 2024 08:44:34 +0100
Subject: [PATCH] Remove support for python 2

---
 .../srv/salt/_runners/foreman_https.py        |  2 +-
 .../salt/_runners/foreman_report_upload.py    | 27 +++++++------------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/salt/minion_auth/srv/salt/_runners/foreman_https.py b/salt/minion_auth/srv/salt/_runners/foreman_https.py
index 20f4f5c..07d686d 100644
--- a/salt/minion_auth/srv/salt/_runners/foreman_https.py
+++ b/salt/minion_auth/srv/salt/_runners/foreman_https.py
@@ -19,7 +19,7 @@ def salt_config():
     """
     Read the foreman configuratoin from FOREMAN_CONFIG
     """
-    with open(FOREMAN_CONFIG, 'r') as config_file:
+    with open(FOREMAN_CONFIG) as config_file:
         config = yaml.safe_load(config_file.read())
     return config
 
diff --git a/salt/report_upload/srv/salt/_runners/foreman_report_upload.py b/salt/report_upload/srv/salt/_runners/foreman_report_upload.py
index 5308357..3984f9f 100644
--- a/salt/report_upload/srv/salt/_runners/foreman_report_upload.py
+++ b/salt/report_upload/srv/salt/_runners/foreman_report_upload.py
@@ -1,40 +1,31 @@
-# -*- coding: utf-8 -*-
 '''
 Uploads reports from the Salt job cache to Foreman
 '''
-from __future__ import absolute_import, print_function, unicode_literals
-from builtins import str
 
-LAST_UPLOADED = '/etc/salt/last_uploaded'
-FOREMAN_CONFIG = '/etc/salt/foreman.yaml'
-LOCK_FILE = '/var/lock/salt-report-upload.lock'
+from http.client import HTTPConnection, HTTPSConnection
 
-try:
-    from http.client import HTTPConnection, HTTPSConnection
-except ImportError:
-    from httplib import HTTPConnection, HTTPSConnection
-
-import io
 import ssl
 import json
 import yaml
 import os
 import base64
-
-# Import python libs
 import logging
 
+LAST_UPLOADED = '/etc/salt/last_uploaded'
+FOREMAN_CONFIG = '/etc/salt/foreman.yaml'
+LOCK_FILE = '/var/lock/salt-report-upload.lock'
+
 log = logging.getLogger(__name__)
 
 
 def salt_config():
-    with open(FOREMAN_CONFIG, 'r') as f:
+    with open(FOREMAN_CONFIG) as f:
         config = yaml.safe_load(f.read())
     return config
 
 
 def write_last_uploaded(last_uploaded):
-    with io.open(LAST_UPLOADED, 'w+') as f:
+    with open(LAST_UPLOADED, 'w+') as f:
         f.write(str(last_uploaded))
 
 
@@ -64,7 +55,7 @@ def upload(report):
 
     if response.status == 200:
         write_last_uploaded(report['job']['job_id'])
-        info_msg = 'Success {0}: {1}'.format(report['job']['job_id'], response.read())
+        info_msg = 'Success {}: {}'.format(report['job']['job_id'], response.read())
         log.info(info_msg)
     else:
         log.error("Unable to upload job - aborting report upload")
@@ -103,7 +94,7 @@ def get_lock():
     if os.path.isfile(LOCK_FILE):
         raise Exception("Unable to obtain lock.")
     else:
-        io.open(LOCK_FILE, 'w+').close()
+        open(LOCK_FILE, 'w+').close()
 
 
 def release_lock():