Merge pull request #1195 from vojtechtrefny/3.10-devel_python2-suppor…

…t-remove

Various code cleanup

blivet/actionlist.py

@@ -22,7 +22,6 @@
 
 import copy
 from functools import wraps
-from six import add_metaclass
 
 from .callbacks import callbacks as _callbacks
 from .deviceaction import ActionCreateDevice
@@ -53,8 +52,7 @@ def wrapped_func(obj, *args, **kwargs):
     return run_func_with_flag_attr_set
 
 
-@add_metaclass(SynchronizedMeta)
-class ActionList(object):
+class ActionList(object, metaclass=SynchronizedMeta):
     _unsynchronized_methods = ['process']
 
     def __init__(self, addfunc=None, removefunc=None):

blivet/blivet.py

@@ -25,7 +25,6 @@
 import contextlib
 import time
 import functools
-import six
 
 from .storage_log import log_method_call, log_exception_info
 from .devices import BTRFSSubVolumeDevice, BTRFSVolumeDevice
@@ -59,8 +58,7 @@
 FSTAB_PATH = "/etc/fstab"
 
 
-@six.add_metaclass(SynchronizedMeta)
-class Blivet(object):
+class Blivet(object, metaclass=SynchronizedMeta):
 
     """ Top-level class for managing storage configuration. """
 

blivet/deviceaction.py

@@ -22,8 +22,6 @@
 
 import copy
 
-from six import add_metaclass
-
 from . import util
 from . import udev
 from .errors import DependencyError, PartitioningError
@@ -108,8 +106,7 @@ def resize_type_from_string(type_string):
             return k
 
 
-@add_metaclass(SynchronizedMeta)
-class DeviceAction(util.ObjectID):
+class DeviceAction(util.ObjectID, metaclass=SynchronizedMeta):
 
     """ An action that will be carried out in the future on a Device.
 
@@ -295,10 +292,7 @@ def _to_string(self):
         return s
 
     def __str__(self):
-        return util.stringize(self._to_string())
-
-    def __unicode__(self):
-        return util.unicodeize(self._to_string())
+        return self._to_string()
 
     def requires(self, action):
         """ Return True if self requires action. """

blivet/devicefactory.py

@@ -20,8 +20,6 @@
 # Red Hat Author(s): David Lehman <[email protected]>
 #
 
-from six import raise_from
-
 from .storage_log import log_method_call
 from .errors import DeviceFactoryError, StorageError
 from .devices import BTRFSDevice, DiskDevice
@@ -746,7 +744,7 @@ def _create_device(self):
         except (StorageError, blockdev.BlockDevError) as e:
             log.error("device post-create method failed: %s", e)
             self.storage.destroy_device(device)
-            raise_from(StorageError(e), e)
+            raise StorageError(e) from e
         else:
             if not device.size:
                 self.storage.destroy_device(device)
@@ -941,7 +939,7 @@ def configure(self):
                 self._revert_devicetree()
 
             if not isinstance(e, (StorageError, OverflowError)):
-                raise_from(DeviceFactoryError(e), e)
+                raise DeviceFactoryError(e) from e
 
             raise
 
@@ -2189,7 +2187,7 @@ def _create_device(self):
         except (StorageError, blockdev.BlockDevError) as e:
             log.error("device post-create method failed: %s", e)
             self.storage.destroy_device(device)
-            raise_from(StorageError(e), e)
+            raise StorageError(e) from e
         else:
             if not device.size:
                 self.storage.destroy_device(device)

blivet/devicelibs/raid.py

@@ -23,8 +23,6 @@
 
 import abc
 
-from six import add_metaclass
-
 from ..errors import RaidError
 from ..size import Size
 
@@ -38,8 +36,7 @@ def div_up(a, b):
     return (a + (b - 1)) // b
 
 
-@add_metaclass(abc.ABCMeta)
-class RAIDLevel(object):
+class RAIDLevel(object, metaclass=abc.ABCMeta):
 
     """An abstract class which is the parent of all classes which represent
        a RAID level.
@@ -77,8 +74,7 @@ def __deepcopy__(self, memo):
         return self
 
 
-@add_metaclass(abc.ABCMeta)
-class RAIDn(RAIDLevel):
+class RAIDn(RAIDLevel, metaclass=abc.ABCMeta):
 
     """An abstract class which is the parent of classes which represent a
        numeric RAID level. A better word would be classification, since 'level'

blivet/devices/cache.py

@@ -24,12 +24,10 @@
 
 """
 
-from six import add_metaclass
 import abc
 
 
-@add_metaclass(abc.ABCMeta)
-class Cache(object):
+class Cache(object, metaclass=abc.ABCMeta):
 
     """Abstract base class for cache objects providing the cache-related
     functionality on cached devices. Instances of this class are not expected to
@@ -74,8 +72,7 @@ def detach(self):
         """
 
 
-@add_metaclass(abc.ABCMeta)
-class CacheStats(object):
+class CacheStats(object, metaclass=abc.ABCMeta):
 
     """Abstract base class for common statistics of caches (cached
     devices). Inheriting classes are expected to add (cache-)type-specific
@@ -109,8 +106,7 @@ def misses(self):
         """number of misses"""
 
 
-@add_metaclass(abc.ABCMeta)
-class CacheRequest(object):
+class CacheRequest(object, metaclass=abc.ABCMeta):
 
     """Abstract base class for cache requests specifying cache parameters for a
     cached device

blivet/devices/container.py

@@ -21,8 +21,6 @@
 
 import abc
 
-from six import add_metaclass
-
 from .. import errors
 from ..storage_log import log_method_call
 from ..formats import get_device_format_class
@@ -34,8 +32,7 @@
 from .storage import StorageDevice
 
 
-@add_metaclass(SynchronizedABCMeta)
-class ContainerDevice(StorageDevice):
+class ContainerDevice(StorageDevice, metaclass=SynchronizedABCMeta):
 
     """ A device that aggregates a set of member devices.
 

blivet/devices/device.py

@@ -21,7 +21,6 @@
 #
 
 import pprint
-from six import add_metaclass
 
 from .. import util
 from ..storage_log import log_method_call
@@ -33,8 +32,7 @@
 from .lib import ParentList
 
 
-@add_metaclass(SynchronizedMeta)
-class Device(util.ObjectID):
+class Device(util.ObjectID, metaclass=SynchronizedMeta):
 
     """ A generic device.
 
@@ -118,10 +116,7 @@ def _to_string(self):
         return s
 
     def __str__(self):
-        return util.stringize(self._to_string())
-
-    def __unicode__(self):
-        return util.unicodeize(self._to_string())
+        return self._to_string()
 
     def _add_parent(self, parent):
         """ Called before adding a parent to this device.

blivet/devices/lvm.py

@@ -28,7 +28,6 @@
 from collections import namedtuple, defaultdict
 from functools import wraps
 from enum import Enum
-import six
 
 import gi
 gi.require_version("BlockDev", "3.0")
@@ -1825,8 +1824,8 @@ def _create(self):
                 extra["profile"] = profile_name
             if self.chunk_size:
                 extra["chunksize"] = str(int(self.chunk_size))
-            data_lv = six.next(lv for lv in self._internal_lvs if lv.int_lv_type == LVMInternalLVtype.data)
-            meta_lv = six.next(lv for lv in self._internal_lvs if lv.int_lv_type == LVMInternalLVtype.meta)
+            data_lv = next(lv for lv in self._internal_lvs if lv.int_lv_type == LVMInternalLVtype.data)
+            meta_lv = next(lv for lv in self._internal_lvs if lv.int_lv_type == LVMInternalLVtype.meta)
             try:
                 blockdev.lvm.thpool_convert(self.vg.name, data_lv.lvname, meta_lv.lvname, self.lvname, **extra)
             except blockdev.LVMError as err:
@@ -2346,8 +2345,8 @@ def _create(self):
             if self.mode:
                 # we need the string here, it will be passed directly to he lvm command
                 extra["cachemode"] = self._cache_mode
-            data_lv = six.next(lv for lv in self._internal_lvs if lv.int_lv_type == LVMInternalLVtype.data)
-            meta_lv = six.next(lv for lv in self._internal_lvs if lv.int_lv_type == LVMInternalLVtype.meta)
+            data_lv = next(lv for lv in self._internal_lvs if lv.int_lv_type == LVMInternalLVtype.data)
+            meta_lv = next(lv for lv in self._internal_lvs if lv.int_lv_type == LVMInternalLVtype.meta)
             try:
                 blockdev.lvm.cache_pool_convert(self.vg.name, data_lv.lvname, meta_lv.lvname, self.lvname, **extra)
             except blockdev.LVMError as err:

blivet/devices/md.py

@@ -21,10 +21,9 @@
 
 import math
 import os
-import six
 import time
 
-from six.moves import reduce
+from functools import reduce
 
 import gi
 gi.require_version("BlockDev", "3.0")
@@ -355,7 +354,7 @@ def _get_member_devices(self):
         return self._member_devices
 
     def _set_member_devices(self, number):
-        if not isinstance(number, six.integer_types):
+        if not isinstance(number, int):
             raise ValueError("member_devices must be an integer")
 
         if not self.exists and number > self.total_devices:

blivet/devices/raid.py

@@ -21,17 +21,14 @@
 
 import abc
 
-from six import add_metaclass
-
 from .. import errors
 from ..i18n import _, P_
 from ..threads import SynchronizedABCMeta
 
 from .storage import StorageDevice
 
 
-@add_metaclass(SynchronizedABCMeta)
-class RaidDevice(StorageDevice):
+class RaidDevice(StorageDevice, metaclass=SynchronizedABCMeta):
 
     """ Metaclass for devices that support RAID in some form. """
     members = abc.abstractproperty(lambda s: [],

blivet/devicetree.py

@@ -23,7 +23,6 @@
 import os
 import pprint
 import re
-import six
 
 import gi
 gi.require_version("BlockDev", "3.0")
@@ -52,8 +51,7 @@
 _LVM_DEVICE_CLASSES = (LVMLogicalVolumeDevice, LVMVolumeGroupDevice)
 
 
-@six.add_metaclass(SynchronizedMeta)
-class DeviceTreeBase(object):
+class DeviceTreeBase(object, metaclass=SynchronizedMeta):
     """ A quasi-tree that represents the devices in the system.
 
         The tree contains a list of :class:`~.devices.StorageDevice` instances,
@@ -500,7 +498,7 @@ def get_device_by_sysfs_path(self, path, incomplete=False, hidden=False):
         result = None
         if path:
             devices = self._filter_devices(incomplete=incomplete, hidden=hidden)
-            result = six.next((d for d in devices if d.sysfs_path == path), None)
+            result = next((d for d in devices if d.sysfs_path == path), None)
         log_method_return(self, result)
         return result
 
@@ -517,7 +515,7 @@ def get_device_by_uuid(self, uuid, incomplete=False, hidden=False):
         result = None
         if uuid:
             devices = self._filter_devices(incomplete=incomplete, hidden=hidden)
-            result = six.next((d for d in devices if d.uuid == uuid or d.format.uuid == uuid), None)
+            result = next((d for d in devices if d.uuid == uuid or d.format.uuid == uuid), None)
         log_method_return(self, result)
         return result
 
@@ -534,7 +532,7 @@ def get_device_by_label(self, label, incomplete=False, hidden=False):
         result = None
         if label:
             devices = self._filter_devices(incomplete=incomplete, hidden=hidden)
-            result = six.next((d for d in devices if getattr(d.format, "label", None) == label), None)
+            result = next((d for d in devices if getattr(d.format, "label", None) == label), None)
         log_method_return(self, result)
         return result
 
@@ -551,9 +549,9 @@ def get_device_by_name(self, name, incomplete=False, hidden=False):
         result = None
         if name:
             devices = self._filter_devices(incomplete=incomplete, hidden=hidden)
-            result = six.next((d for d in devices if d.name == name or
-                               (isinstance(d, _LVM_DEVICE_CLASSES) and d.name == name.replace("--", "-"))),
-                              None)
+            result = next((d for d in devices if d.name == name or
+                          (isinstance(d, _LVM_DEVICE_CLASSES) and d.name == name.replace("--", "-"))),
+                          None)
         log_method_return(self, result)
         return result
 
@@ -577,9 +575,9 @@ def get_device_by_path(self, path, incomplete=False, hidden=False):
             # The usual order of the devices list is one where leaves are at
             # the end. So that the search can prefer leaves to interior nodes
             # the list that is searched is the reverse of the devices list.
-            result = six.next((d for d in reversed(list(devices)) if d.path == path or
-                               (isinstance(d, _LVM_DEVICE_CLASSES) and d.path == path.replace("--", "-"))),
-                              None)
+            result = next((d for d in reversed(list(devices)) if d.path == path or
+                          (isinstance(d, _LVM_DEVICE_CLASSES) and d.path == path.replace("--", "-"))),
+                          None)
 
         log_method_return(self, result)
         return result
@@ -595,7 +593,7 @@ def get_device_by_id(self, id_num, incomplete=False, hidden=False):
         """
         log_method_call(self, id_num=id_num, incomplete=incomplete, hidden=hidden)
         devices = self._filter_devices(incomplete=incomplete, hidden=hidden)
-        result = six.next((d for d in devices if d.id == id_num), None)
+        result = next((d for d in devices if d.id == id_num), None)
         log_method_return(self, result)
         return result
 
@@ -610,7 +608,7 @@ def get_device_by_device_id(self, device_id, incomplete=False, hidden=False):
         """
         log_method_call(self, device_id=device_id, incomplete=incomplete, hidden=hidden)
         devices = self._filter_devices(incomplete=incomplete, hidden=hidden)
-        result = six.next((d for d in devices if d.device_id == device_id), None)
+        result = next((d for d in devices if d.device_id == device_id), None)
         log_method_return(self, result)
         return result
 

blivet/events/handler.py

@@ -20,8 +20,6 @@
 # Red Hat Author(s): David Lehman <[email protected]>
 #
 
-from six import add_metaclass
-
 from ..callbacks import callbacks
 from ..errors import DeviceError, EventHandlingError
 from ..devices import DM_MAJORS, MD_MAJORS
@@ -37,8 +35,7 @@
 event_log = logging.getLogger("blivet.event")
 
 
-@add_metaclass(SynchronizedMeta)
-class EventHandlerMixin(object):
+class EventHandlerMixin(object, metaclass=SynchronizedMeta):
     def __init__(self):
         event_manager.handler_cb = self.handle_event