From f5d6c816755605166dc29350cbb1fad6c724cd0c Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Nov 09 2023 13:01:20 +0000
Subject: PR#3940: Remove six.configparser.SafeConfingParser from tests


Merges #3940
https://pagure.io/koji/pull-request/3940

Fixes: #3939
https://pagure.io/koji/issue/3939
Python 3.12 loses SafeConfigParser

---

diff --git a/tests/test_lib/test_utils.py b/tests/test_lib/test_utils.py
index 3e977b7..ce4a5e3 100644
--- a/tests/test_lib/test_utils.py
+++ b/tests/test_lib/test_utils.py
@@ -8,7 +8,6 @@ import mock
 import optparse
 import os
 import resource
-import six.moves.configparser
 import time
 import six
 import shutil
@@ -240,10 +239,12 @@ class ConfigFileTestCase(unittest.TestCase):
         self.manager.isdir = mock.patch("os.path.isdir").start()
         self.manager.isfile = mock.patch("os.path.isfile").start()
         self.manager.access = mock.patch("os.access", return_value=True).start()
-        self.manager.cp_clz = mock.patch("six.moves.configparser.ConfigParser",
-                                         spec=True).start()
-        self.manager.scp_clz = mock.patch("six.moves.configparser.SafeConfigParser",
-                                          spec=True).start()
+        if six.PY2:
+            self.manager.scp_clz = mock.patch("ConfigParser.SafeConfigParser",
+                                              spec=True).start()
+        else:
+            self.manager.cp_clz = mock.patch("configparser.ConfigParser",
+                                             spec=True).start()
         self.manager.rcp_clz = mock.patch("six.moves.configparser.RawConfigParser",
                                           spec=True).start()
         if six.PY2:
diff --git a/tests/test_plugins/test_protonmsg.py b/tests/test_plugins/test_protonmsg.py
index 66543c1..d41f54e 100644
--- a/tests/test_plugins/test_protonmsg.py
+++ b/tests/test_plugins/test_protonmsg.py
@@ -9,7 +9,11 @@ import protonmsg
 import mock
 import six
 from mock import patch, MagicMock
-from six.moves.configparser import ConfigParser, SafeConfigParser
+if six.PY2:
+    from ConfigParser import SafeConfigParser as ConfigParser
+else:
+    from configparser import ConfigParser
+
 
 from koji.context import context
 
@@ -324,11 +328,10 @@ topic_prefix = koji
 connect_timeout = 10
 send_timeout = 60
 """)
+        conf = ConfigParser()
         if six.PY2:
-            conf = SafeConfigParser()
             conf.readfp(confdata)
         else:
-            conf = ConfigParser()
             conf.read_file(confdata)
         self.handler = protonmsg.TimeoutHandler('amqps://broker1.example.com:5671', [], conf)
 
@@ -349,11 +352,10 @@ topic_prefix = koji
 connect_timeout = 10
 send_timeout = 60
 """)
+        conf = ConfigParser()
         if six.PY2:
-            conf = SafeConfigParser()
             conf.readfp(confdata)
         else:
-            conf = ConfigParser()
             conf.read_file(confdata)
         handler = protonmsg.TimeoutHandler('amqp://broker1.example.com:5672', [], conf)
         event = MagicMock()