diff --git a/qubes/storage/__init__.py b/qubes/storage/__init__.py index 959122b6..1062a4c7 100644 --- a/qubes/storage/__init__.py +++ b/qubes/storage/__init__.py @@ -99,7 +99,7 @@ class Volume: ''' - super(Volume, self).__init__(**kwargs) + super().__init__(**kwargs) assert isinstance(pool, Pool) assert source is None or (isinstance(source, Volume) and source.pool == pool) @@ -717,7 +717,7 @@ class Pool: root_img_size = qubes.config.defaults['root_img_size'] def __init__(self, name, revisions_to_keep=1, **kwargs): - super(Pool, self).__init__(**kwargs) + super().__init__(**kwargs) self._volumes_collection = VolumesCollection(self) self.name = name self.revisions_to_keep = revisions_to_keep diff --git a/qubes/storage/file.py b/qubes/storage/file.py index b80b2fd8..339edd89 100644 --- a/qubes/storage/file.py +++ b/qubes/storage/file.py @@ -53,8 +53,7 @@ class FilePool(qubes.storage.Pool): driver = 'file' def __init__(self, revisions_to_keep=1, dir_path=None, **kwargs): - super(FilePool, self).__init__(revisions_to_keep=revisions_to_keep, - **kwargs) + super().__init__(revisions_to_keep=revisions_to_keep, **kwargs) assert dir_path, "No pool dir_path specified" self.dir_path = os.path.normpath(dir_path) self._volumes = [] @@ -182,7 +181,7 @@ class FileVolume(qubes.storage.Volume): self.dir_path = dir_path assert self.dir_path, "dir_path not specified" self._revisions_to_keep = 0 - super(FileVolume, self).__init__(**kwargs) + super().__init__(**kwargs) if self.snap_on_start: img_name = self.source.vid + '-cow.img' diff --git a/qubes/storage/kernels.py b/qubes/storage/kernels.py index 80600e20..f6a7595a 100644 --- a/qubes/storage/kernels.py +++ b/qubes/storage/kernels.py @@ -33,7 +33,7 @@ class LinuxModules(Volume): def __init__(self, target_dir, kernel_version, **kwargs): kwargs['vid'] = '' - super(LinuxModules, self).__init__(**kwargs) + super().__init__(**kwargs) self._kernel_version = kernel_version self.target_dir = target_dir assert self.revisions_to_keep == 0 @@ -156,7 +156,7 @@ class LinuxKernel(Pool): def __init__(self, name=None, dir_path=None): assert dir_path, 'Missing dir_path' - super(LinuxKernel, self).__init__(name=name, revisions_to_keep=0) + super().__init__(name=name, revisions_to_keep=0) self.dir_path = dir_path def init_volume(self, vm, volume_config): diff --git a/qubes/storage/lvm.py b/qubes/storage/lvm.py index b2050399..81952abf 100644 --- a/qubes/storage/lvm.py +++ b/qubes/storage/lvm.py @@ -81,8 +81,7 @@ class ThinPool(qubes.storage.Pool): driver = 'lvm_thin' def __init__(self, volume_group, thin_pool, revisions_to_keep=1, **kwargs): - super(ThinPool, self).__init__(revisions_to_keep=revisions_to_keep, - **kwargs) + super().__init__(revisions_to_keep=revisions_to_keep, **kwargs) self.volume_group = volume_group self.thin_pool = thin_pool self._pool_id = "{!s}/{!s}".format(volume_group, thin_pool) @@ -316,7 +315,7 @@ class ThinVolume(qubes.storage.Volume): def __init__(self, volume_group, **kwargs): self.volume_group = volume_group - super(ThinVolume, self).__init__(**kwargs) + super().__init__(**kwargs) self.log = logging.getLogger('qubes.storage.lvm.%s' % str(self.pool)) if self.snap_on_start or self.save_on_stop: @@ -742,7 +741,7 @@ class ThinVolume(qubes.storage.Volume): '/dev/' + self._vid_snap, self.name, self.script, self.rw, self.domain, self.devtype) - return super(ThinVolume, self).block_device() + return super().block_device() @property def usage(self): # lvm thin usage always returns at least the same usage as