From 26283c82011d0a8ffe12b38f5db426c53dfb6863 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Mon, 14 Oct 2024 14:43:53 +0200
Subject: [PATCH] pylint: fix old import errors that appear as new

https://stackoverflow.com/questions/47196947/py-test-deal-with-both-pylint-and-flake8-when-importing-features-from-a-module
---
 cli/tests/test_distgit.py               |  2 +-
 cli/tests/test_mock_config.py           |  6 +++++-
 rpmbuild/copr_rpmbuild/providers/scm.py | 10 +++++-----
 rpmbuild/main.py                        |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/cli/tests/test_distgit.py b/cli/tests/test_distgit.py
index ff675586b..d778ffcf3 100644
--- a/cli/tests/test_distgit.py
+++ b/cli/tests/test_distgit.py
@@ -10,7 +10,7 @@
 import copr
 # pylint: disable=unused-import
 from cli_tests_lib import (
-    f_test_config,
+    f_test_config,  # pylint: disable=unused-variable
     mock,
     config as mock_config,
     fixture,
diff --git a/cli/tests/test_mock_config.py b/cli/tests/test_mock_config.py
index 7566b9fad..fe92396b9 100644
--- a/cli/tests/test_mock_config.py
+++ b/cli/tests/test_mock_config.py
@@ -6,7 +6,11 @@
 
 from copr_cli import main
 
-from cli_tests_lib import mock, f_test_config, fixture
+from cli_tests_lib import (
+    mock,
+    f_test_config,  # pylint: disable=unused-variable
+    fixture,
+)
 
 
 class TestMockConfig():
diff --git a/rpmbuild/copr_rpmbuild/providers/scm.py b/rpmbuild/copr_rpmbuild/providers/scm.py
index e13eb8827..9ae3a0893 100644
--- a/rpmbuild/copr_rpmbuild/providers/scm.py
+++ b/rpmbuild/copr_rpmbuild/providers/scm.py
@@ -1,15 +1,15 @@
 import os
 import re
 import logging
-import re
 
-from copr_rpmbuild import helpers
+from urllib.parse import urlparse
 
 from jinja2 import Environment, FileSystemLoader
-from ..helpers import run_cmd, CONF_DIRS, get_mock_uniqueext
-from .base import Provider
 
-from urllib.parse import urlparse
+from copr_rpmbuild import helpers
+from copr_rpmbuild.helpers import run_cmd, CONF_DIRS, get_mock_uniqueext
+from copr_rpmbuild.providers.base import Provider
+
 
 
 log = logging.getLogger("__main__")
diff --git a/rpmbuild/main.py b/rpmbuild/main.py
index 0b74e45f7..32d084959 100755
--- a/rpmbuild/main.py
+++ b/rpmbuild/main.py
@@ -12,7 +12,7 @@
 import pprint
 import shlex
 
-from urllib.parse import urlparse, urljoin, urlencode
+from urllib.parse import urljoin, urlencode
 
 from copr_common.request import SafeRequest, RequestError
 from copr_rpmbuild import providers