From e939a0e481bc7b5186fa7544dbd8dee7b92bbd47 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 6 Dec 2021 23:54:48 +0900
Subject: [PATCH] Remove additional patching to use gitpython with eventlet

... because eventlet is no longer involved since Mistral was removed.

Depends-on: https://review.opendev.org/821784
Change-Id: I5312652b5229d66fa4a5981c590a2aecb79dd14c
---
 requirements.txt                          |  1 -
 tripleo_common/tests/utils/test_config.py |  2 +-
 tripleo_common/utils/config.py            |  2 +-
 tripleo_common/utils/safe_import.py       | 28 -----------------------
 4 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 tripleo_common/utils/safe_import.py

diff --git a/requirements.txt b/requirements.txt
index 06d5fff8a..761984e82 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,6 @@
 
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 GitPython>=1.0.1 # BSD License (3 clause)
-eventlet!=0.20.1,>=0.20.0 # MIT
 python-heatclient>=1.10.0 # Apache-2.0
 oslo.config>=5.2.0 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
diff --git a/tripleo_common/tests/utils/test_config.py b/tripleo_common/tests/utils/test_config.py
index a8707ebf3..79dd7fc92 100644
--- a/tripleo_common/tests/utils/test_config.py
+++ b/tripleo_common/tests/utils/test_config.py
@@ -12,6 +12,7 @@
 
 import datetime
 import fixtures
+import git
 import os
 from unittest import mock
 from unittest.mock import patch
@@ -26,7 +27,6 @@ from tripleo_common import constants
 from tripleo_common.tests import base
 from tripleo_common.tests.fake_config import fakes
 from tripleo_common.utils import config as ooo_config
-from tripleo_common.utils.safe_import import git
 
 RESOURCES_YAML_CONTENTS = """heat_template_version: 2016-04-08
 resources:
diff --git a/tripleo_common/utils/config.py b/tripleo_common/utils/config.py
index 55ec1bec4..2fa43a61c 100644
--- a/tripleo_common/utils/config.py
+++ b/tripleo_common/utils/config.py
@@ -13,6 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import git
 import json
 import logging
 import os
@@ -26,7 +27,6 @@ import jinja2
 
 from tripleo_common import constants
 from tripleo_common import inventory
-from tripleo_common.utils.safe_import import git
 
 LOG = logging.getLogger(__name__)
 
diff --git a/tripleo_common/utils/safe_import.py b/tripleo_common/utils/safe_import.py
deleted file mode 100644
index ad75d60e4..000000000
--- a/tripleo_common/utils/safe_import.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2019 Red Hat, Inc.
-# All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-
-from eventlet.green import subprocess
-import eventlet.patcher as patcher
-
-# Due to an eventlet issue subprocess is not being correctly patched
-# on git.refs
-patcher.inject('git.refs', None, ('subprocess', subprocess), )
-
-# this has to be loaded after the inject.
-
-import git  # noqa: E402
-
-Repo = git.Repo