From ff8af60ee3e1aed688b31831c71eae25792d4b8f Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Tue, 6 Jun 2023 09:04:54 +0200
Subject: [PATCH] Import BlockDev from blivet instead of gi

We are planning to release a new major version of libblockdev soon
and because version needs to be specified when importing from gi
it would make the import unnecessarily complicated if we wanted to
keep it backwards compatible. Anaconda is already using blivet so
importing BlockDev from it instead of gi shouldn't change anything.
---
 pyanaconda/modules/storage/checker/utils.py                 | 6 +-----
 pyanaconda/modules/storage/dasd/discover.py                 | 4 +---
 pyanaconda/modules/storage/dasd/format.py                   | 4 +---
 pyanaconda/modules/storage/devicetree/fsset.py              | 5 +----
 pyanaconda/modules/storage/initialization.py                | 5 +----
 pyanaconda/modules/storage/installation.py                  | 6 +-----
 pyanaconda/modules/storage/nvdimm/nvdimm.py                 | 6 +-----
 pyanaconda/modules/storage/zfcp/discover.py                 | 4 +---
 .../pyanaconda_tests/modules/storage/test_module_nvdimm.py  | 5 +----
 9 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/pyanaconda/modules/storage/checker/utils.py b/pyanaconda/modules/storage/checker/utils.py
index 5df68e4..c32ff01 100644
--- a/pyanaconda/modules/storage/checker/utils.py
+++ b/pyanaconda/modules/storage/checker/utils.py
@@ -15,13 +15,9 @@
 # License and may only be used or replicated with the express permission of
 # Red Hat, Inc.
 #
-import gi
-gi.require_version("BlockDev", "2.0")
-from gi.repository import BlockDev as blockdev
-
 from collections import defaultdict
 
-from blivet import arch, util
+from blivet import arch, blockdev, util
 from blivet.devicefactory import get_device_type
 from blivet.size import Size
 
diff --git a/pyanaconda/modules/storage/dasd/discover.py b/pyanaconda/modules/storage/dasd/discover.py
index 06e3b39..392aeec 100644
--- a/pyanaconda/modules/storage/dasd/discover.py
+++ b/pyanaconda/modules/storage/dasd/discover.py
@@ -17,9 +17,7 @@
 # License and may only be used or replicated with the express permission of
 # Red Hat, Inc.
 #
-import gi
-gi.require_version("BlockDev", "2.0")
-from gi.repository import BlockDev as blockdev
+from blivet import blockdev
 
 from pyanaconda.core.regexes import DASD_DEVICE_NUMBER
 from pyanaconda.modules.common.task import Task
diff --git a/pyanaconda/modules/storage/dasd/format.py b/pyanaconda/modules/storage/dasd/format.py
index 7ae389b..ff540d4 100644
--- a/pyanaconda/modules/storage/dasd/format.py
+++ b/pyanaconda/modules/storage/dasd/format.py
@@ -20,9 +20,7 @@
 from pyanaconda.modules.common.task import Task
 from pyanaconda.anaconda_loggers import get_module_logger
 
-import gi
-gi.require_version("BlockDev", "2.0")
-from gi.repository import BlockDev as blockdev
+from blivet import blockdev
 
 log = get_module_logger(__name__)
 
diff --git a/pyanaconda/modules/storage/devicetree/fsset.py b/pyanaconda/modules/storage/devicetree/fsset.py
index 0d151d3..0fbefa0 100644
--- a/pyanaconda/modules/storage/devicetree/fsset.py
+++ b/pyanaconda/modules/storage/devicetree/fsset.py
@@ -19,10 +19,7 @@ import os
 import shutil
 import time
 
-import gi
-gi.require_version("BlockDev", "2.0")
-from gi.repository import BlockDev as blockdev
-
+from blivet import blockdev
 from blivet.devices import NoDevice, DirectoryDevice, NFSDevice, FileDevice, MDRaidArrayDevice, \
     NetworkStorageDevice, OpticalDevice
 from blivet.errors import UnrecognizedFSTabEntryError, FSTabTypeMismatchError
diff --git a/pyanaconda/modules/storage/initialization.py b/pyanaconda/modules/storage/initialization.py
index c9fa787..0ac15ed 100644
--- a/pyanaconda/modules/storage/initialization.py
+++ b/pyanaconda/modules/storage/initialization.py
@@ -15,6 +15,7 @@
 # License and may only be used or replicated with the express permission of
 # Red Hat, Inc.
 #
+from blivet import blockdev
 from blivet import util as blivet_util, udev, arch
 from blivet.devicelibs import crypto
 from blivet.flags import flags as blivet_flags
@@ -25,10 +26,6 @@ from pyanaconda.anaconda_loggers import get_module_logger
 from pyanaconda.anaconda_logging import program_log_lock
 from pyanaconda.core.configuration.anaconda import conf
 
-import gi
-gi.require_version("BlockDev", "2.0")
-from gi.repository import BlockDev as blockdev
-
 __all__ = ["enable_installer_mode"]
 
 log = get_module_logger(__name__)
diff --git a/pyanaconda/modules/storage/installation.py b/pyanaconda/modules/storage/installation.py
index e57f56d..7ca56c1 100644
--- a/pyanaconda/modules/storage/installation.py
+++ b/pyanaconda/modules/storage/installation.py
@@ -25,7 +25,7 @@ import parted
 from datetime import timedelta
 from time import sleep
 
-from blivet import callbacks as blivet_callbacks, util as blivet_util, arch
+from blivet import callbacks as blivet_callbacks, util as blivet_util, arch, blockdev
 from blivet.errors import FSResizeError, FormatResizeError, StorageError
 from blivet.util import get_current_entropy
 from blivet.devicelibs.lvm import HAVE_LVMDEVICES
@@ -40,10 +40,6 @@ from pyanaconda.modules.common.constants.services import STORAGE
 from pyanaconda.modules.common.errors.installation import StorageInstallationError
 from pyanaconda.modules.common.task import Task
 
-import gi
-gi.require_version("BlockDev", "2.0")
-from gi.repository import BlockDev as blockdev
-
 log = get_module_logger(__name__)
 
 
diff --git a/pyanaconda/modules/storage/nvdimm/nvdimm.py b/pyanaconda/modules/storage/nvdimm/nvdimm.py
index f9aef8b..58172f8 100644
--- a/pyanaconda/modules/storage/nvdimm/nvdimm.py
+++ b/pyanaconda/modules/storage/nvdimm/nvdimm.py
@@ -17,7 +17,7 @@
 # License and may only be used or replicated with the express permission of
 # Red Hat, Inc.
 #
-from blivet import udev
+from blivet import blockdev, udev
 from blivet.devices import NVDIMMNamespaceDevice
 from blivet.static_data import nvdimm
 
@@ -31,10 +31,6 @@ from pyanaconda.modules.common.constants.objects import NVDIMM
 from pyanaconda.modules.storage.nvdimm.nvdimm_interface import NVDIMMInterface
 from pyanaconda.modules.storage.nvdimm.reconfigure import NVDIMMReconfigureTask
 
-import gi
-gi.require_version("BlockDev", "2.0")
-from gi.repository import BlockDev as blockdev
-
 log = get_module_logger(__name__)
 
 __all__ = ["NVDIMMModule"]
diff --git a/pyanaconda/modules/storage/zfcp/discover.py b/pyanaconda/modules/storage/zfcp/discover.py
index c212a79..57810a1 100644
--- a/pyanaconda/modules/storage/zfcp/discover.py
+++ b/pyanaconda/modules/storage/zfcp/discover.py
@@ -17,9 +17,7 @@
 # License and may only be used or replicated with the express permission of
 # Red Hat, Inc.
 #
-import gi
-gi.require_version("BlockDev", "2.0")
-from gi.repository import BlockDev as blockdev
+from blivet import blockdev
 
 from blivet.zfcp import zfcp
 from pyanaconda.core.regexes import DASD_DEVICE_NUMBER, ZFCP_WWPN_NUMBER, ZFCP_LUN_NUMBER
diff --git a/tests/unit_tests/pyanaconda_tests/modules/storage/test_module_nvdimm.py b/tests/unit_tests/pyanaconda_tests/modules/storage/test_module_nvdimm.py
index 7d0c77a..ed4b8c8 100644
--- a/tests/unit_tests/pyanaconda_tests/modules/storage/test_module_nvdimm.py
+++ b/tests/unit_tests/pyanaconda_tests/modules/storage/test_module_nvdimm.py
@@ -23,6 +23,7 @@ import pytest
 from textwrap import dedent
 from unittest.mock import patch, Mock
 
+from blivet import blockdev
 from blivet.devices import NVDIMMNamespaceDevice
 from blivet.formats import get_format
 from blivet.size import Size
@@ -38,10 +39,6 @@ from pyanaconda.modules.storage.nvdimm.reconfigure import NVDIMMReconfigureTask
 from pyanaconda.modules.storage.storage import StorageService
 from pykickstart.constants import NVDIMM_MODE_SECTOR, NVDIMM_ACTION_RECONFIGURE
 
-import gi
-gi.require_version("BlockDev", "2.0")
-from gi.repository import BlockDev as blockdev
-
 
 class NVDIMMInterfaceTestCase(unittest.TestCase):
     """Test DBus interface of the NVDIMM module."""
-- 
2.41.0