From 437466d120c4c9d43d14737b52f4a99379494f10 Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Fri, 22 Mar 2024 15:35:47 -0500
Subject: [PATCH] Switch from SafeConfigParser to ConfigParser

The configparser.SafeConfigParser class was renamed to ConfigParser in
Python 3.2. In Python 3.10, it was finally removed.

The import was copy/pasted from the debian generator to the RPM
generator, but isn't actually used there and could be removed.
---
 .github/workflows/ci.yaml            | 4 +---
 bloom/generators/debian/generator.py | 6 +++---
 bloom/generators/rpm/generator.py    | 5 -----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ec45193e..d00a4bea 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -10,9 +10,7 @@ jobs:
   pytest:
     uses: ros-infrastructure/ci/.github/workflows/pytest.yaml@main
     with:
-      matrix-filter: >-
-        del(.matrix.os[] | select(contains("windows"))) | del(.matrix.python[] |
-        select(contains("3.10") or contains("3.11") or contains("3.12")))
+      matrix-filter: del(.matrix.os[] | select(contains("windows")))
   yamllint:
     runs-on: ubuntu-latest
     steps:
diff --git a/bloom/generators/debian/generator.py b/bloom/generators/debian/generator.py
index fe629c8d..f90c1d54 100644
--- a/bloom/generators/debian/generator.py
+++ b/bloom/generators/debian/generator.py
@@ -45,9 +45,9 @@
 
 # Python 2/3 support.
 try:
-    from configparser import SafeConfigParser
+    from configparser import ConfigParser
 except ImportError:
-    from ConfigParser import SafeConfigParser
+    from ConfigParser import SafeConfigParser as ConfigParser
 from dateutil import tz
 from packaging.version import parse as parse_version
 
@@ -397,7 +397,7 @@ def generate_substitutions_from_package(
         setup_cfg_path = os.path.join(package_path, 'setup.cfg')
         data['pass_install_scripts'] = True
         if os.path.isfile(setup_cfg_path):
-            setup_cfg = SafeConfigParser()
+            setup_cfg = ConfigParser()
             setup_cfg.read([setup_cfg_path])
             if (
                     setup_cfg.has_option('install', 'install-scripts') or
diff --git a/bloom/generators/rpm/generator.py b/bloom/generators/rpm/generator.py
index 247c29f8..59f778e1 100644
--- a/bloom/generators/rpm/generator.py
+++ b/bloom/generators/rpm/generator.py
@@ -44,11 +44,6 @@
 import traceback
 import textwrap
 
-# Python 2/3 support.
-try:
-    from configparser import SafeConfigParser
-except ImportError:
-    from ConfigParser import SafeConfigParser
 from dateutil import tz
 from distutils.version import LooseVersion
 from time import strptime