From cd7c72d6d5a5110173d0d3f60f2991b1dc30fc26 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 17 Jun 2015 14:25:23 +0300 Subject: wic: Code cleanup: bad-classmethod-argument Fixed wrong name for the first argument in class methods. Pylint complains about the issue this way: Class method should have 'cls' as first argument Signed-off-by: Ed Bartosh Signed-off-by: Ross Burton --- scripts/lib/wic/pluginbase.py | 8 ++++---- scripts/lib/wic/plugins/imager/direct_plugin.py | 6 +++--- scripts/lib/wic/plugins/source/bootimg-efi.py | 12 ++++++------ scripts/lib/wic/plugins/source/bootimg-partition.py | 6 +++--- scripts/lib/wic/plugins/source/bootimg-pcbios.py | 6 +++--- scripts/lib/wic/plugins/source/fsimage.py | 6 +++--- scripts/lib/wic/plugins/source/rawcopy.py | 6 +++--- scripts/lib/wic/plugins/source/rootfs.py | 4 ++-- 8 files changed, 27 insertions(+), 27 deletions(-) (limited to 'scripts') diff --git a/scripts/lib/wic/pluginbase.py b/scripts/lib/wic/pluginbase.py index 72bcad2b7a..50e442d61c 100644 --- a/scripts/lib/wic/pluginbase.py +++ b/scripts/lib/wic/pluginbase.py @@ -52,7 +52,7 @@ class SourcePlugin(_Plugin): """ @classmethod - def do_install_disk(self, disk, disk_name, cr, workdir, oe_builddir, + def do_install_disk(cls, disk, disk_name, cr, workdir, oe_builddir, bootimg_dir, kernel_dir, native_sysroot): """ Called after all partitions have been prepared and assembled into a @@ -62,7 +62,7 @@ class SourcePlugin(_Plugin): msger.debug("SourcePlugin: do_install_disk: disk: %s" % disk_name) @classmethod - def do_stage_partition(self, part, source_params, cr, cr_workdir, + def do_stage_partition(cls, part, source_params, cr, cr_workdir, oe_builddir, bootimg_dir, kernel_dir, native_sysroot): """ @@ -79,7 +79,7 @@ class SourcePlugin(_Plugin): msger.debug("SourcePlugin: do_stage_partition: part: %s" % part) @classmethod - def do_configure_partition(self, part, source_params, cr, cr_workdir, + def do_configure_partition(cls, part, source_params, cr, cr_workdir, oe_builddir, bootimg_dir, kernel_dir, native_sysroot): """ @@ -90,7 +90,7 @@ class SourcePlugin(_Plugin): msger.debug("SourcePlugin: do_configure_partition: part: %s" % part) @classmethod - def do_prepare_partition(self, part, source_params, cr, cr_workdir, + def do_prepare_partition(cls, part, source_params, cr, cr_workdir, oe_builddir, bootimg_dir, kernel_dir, rootfs_dir, native_sysroot): """ diff --git a/scripts/lib/wic/plugins/imager/direct_plugin.py b/scripts/lib/wic/plugins/imager/direct_plugin.py index 17888e971c..1720f7bb20 100644 --- a/scripts/lib/wic/plugins/imager/direct_plugin.py +++ b/scripts/lib/wic/plugins/imager/direct_plugin.py @@ -36,7 +36,7 @@ class DirectPlugin(ImagerPlugin): name = 'direct' @classmethod - def __rootfs_dir_to_dict(self, rootfs_dirs): + def __rootfs_dir_to_dict(cls, rootfs_dirs): """ Gets a string that contain 'connection=dir' splitted by space and return a dict @@ -49,7 +49,7 @@ class DirectPlugin(ImagerPlugin): return krootfs_dir @classmethod - def do_create(self, subcmd, opts, *args): + def do_create(cls, subcmd, opts, *args): """ Create direct image, called from creator as 'direct' cmd """ @@ -67,7 +67,7 @@ class DirectPlugin(ImagerPlugin): image_output_dir = args[5] oe_builddir = args[6] - krootfs_dir = self.__rootfs_dir_to_dict(rootfs_dir) + krootfs_dir = cls.__rootfs_dir_to_dict(rootfs_dir) configmgr._ksconf = ksconf diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index d3b8468c7b..f50f631313 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -37,7 +37,7 @@ class BootimgEFIPlugin(SourcePlugin): name = 'bootimg-efi' @classmethod - def do_configure_grubefi(self, hdddir, cr, cr_workdir): + def do_configure_grubefi(cls, hdddir, cr, cr_workdir): """ Create loader-specific (grub-efi) config """ @@ -71,7 +71,7 @@ class BootimgEFIPlugin(SourcePlugin): cfg.close() @classmethod - def do_configure_gummiboot(self, hdddir, cr, cr_workdir): + def do_configure_gummiboot(cls, hdddir, cr, cr_workdir): """ Create loader-specific (gummiboot) config """ @@ -112,7 +112,7 @@ class BootimgEFIPlugin(SourcePlugin): @classmethod - def do_configure_partition(self, part, source_params, cr, cr_workdir, + def do_configure_partition(cls, part, source_params, cr, cr_workdir, oe_builddir, bootimg_dir, kernel_dir, native_sysroot): """ @@ -127,9 +127,9 @@ class BootimgEFIPlugin(SourcePlugin): try: if source_params['loader'] == 'grub-efi': - self.do_configure_grubefi(hdddir, cr, cr_workdir) + cls.do_configure_grubefi(hdddir, cr, cr_workdir) elif source_params['loader'] == 'gummiboot': - self.do_configure_gummiboot(hdddir, cr, cr_workdir) + cls.do_configure_gummiboot(hdddir, cr, cr_workdir) else: msger.error("unrecognized bootimg-efi loader: %s" % source_params['loader']) except KeyError: @@ -137,7 +137,7 @@ class BootimgEFIPlugin(SourcePlugin): @classmethod - def do_prepare_partition(self, part, source_params, cr, cr_workdir, + def do_prepare_partition(cls, part, source_params, cr, cr_workdir, oe_builddir, bootimg_dir, kernel_dir, rootfs_dir, native_sysroot): """ diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py index 909e59b6e2..2ffce6b3b3 100644 --- a/scripts/lib/wic/plugins/source/bootimg-partition.py +++ b/scripts/lib/wic/plugins/source/bootimg-partition.py @@ -35,7 +35,7 @@ class BootimgPartitionPlugin(SourcePlugin): name = 'bootimg-partition' @classmethod - def do_install_disk(self, disk, disk_name, cr, workdir, oe_builddir, + def do_install_disk(cls, disk, disk_name, cr, workdir, oe_builddir, bootimg_dir, kernel_dir, native_sysroot): """ Called after all partitions have been prepared and assembled into a @@ -44,7 +44,7 @@ class BootimgPartitionPlugin(SourcePlugin): pass @classmethod - def do_configure_partition(self, part, source_params, cr, cr_workdir, + def do_configure_partition(cls, part, source_params, cr, cr_workdir, oe_builddir, bootimg_dir, kernel_dir, native_sysroot): """ @@ -55,7 +55,7 @@ class BootimgPartitionPlugin(SourcePlugin): pass @classmethod - def do_prepare_partition(self, part, source_params, cr, cr_workdir, + def do_prepare_partition(cls, part, source_params, cr, cr_workdir, oe_builddir, bootimg_dir, kernel_dir, rootfs_dir, native_sysroot): """ diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index 5caffbc8e2..ae5fc0ca2a 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py @@ -37,7 +37,7 @@ class BootimgPcbiosPlugin(SourcePlugin): name = 'bootimg-pcbios' @classmethod - def do_install_disk(self, disk, disk_name, cr, workdir, oe_builddir, + def do_install_disk(cls, disk, disk_name, cr, workdir, oe_builddir, bootimg_dir, kernel_dir, native_sysroot): """ Called after all partitions have been prepared and assembled into a @@ -64,7 +64,7 @@ class BootimgPcbiosPlugin(SourcePlugin): raise ImageError("Unable to set MBR to %s" % full_path) @classmethod - def do_configure_partition(self, part, source_params, cr, cr_workdir, + def do_configure_partition(cls, part, source_params, cr, cr_workdir, oe_builddir, bootimg_dir, kernel_dir, native_sysroot): """ @@ -113,7 +113,7 @@ class BootimgPcbiosPlugin(SourcePlugin): cfg.close() @classmethod - def do_prepare_partition(self, part, source_params, cr, cr_workdir, + def do_prepare_partition(cls, part, source_params, cr, cr_workdir, oe_builddir, bootimg_dir, kernel_dir, rootfs_dir, native_sysroot): """ diff --git a/scripts/lib/wic/plugins/source/fsimage.py b/scripts/lib/wic/plugins/source/fsimage.py index ef56cf278b..cd59c6e87e 100644 --- a/scripts/lib/wic/plugins/source/fsimage.py +++ b/scripts/lib/wic/plugins/source/fsimage.py @@ -25,7 +25,7 @@ class FSImagePlugin(SourcePlugin): name = 'fsimage' @classmethod - def do_install_disk(self, disk, disk_name, cr, workdir, oe_builddir, + def do_install_disk(cls, disk, disk_name, cr, workdir, oe_builddir, bootimg_dir, kernel_dir, native_sysroot): """ Called after all partitions have been prepared and assembled into a @@ -34,7 +34,7 @@ class FSImagePlugin(SourcePlugin): pass @classmethod - def do_configure_partition(self, part, source_params, cr, cr_workdir, + def do_configure_partition(cls, part, source_params, cr, cr_workdir, oe_builddir, bootimg_dir, kernel_dir, native_sysroot): """ @@ -44,7 +44,7 @@ class FSImagePlugin(SourcePlugin): pass @classmethod - def do_prepare_partition(self, part, source_params, cr, cr_workdir, + def do_prepare_partition(cls, part, source_params, cr, cr_workdir, oe_builddir, bootimg_dir, kernel_dir, rootfs_dir, native_sysroot): """ diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py index 444c0268fb..df07851751 100644 --- a/scripts/lib/wic/plugins/source/rawcopy.py +++ b/scripts/lib/wic/plugins/source/rawcopy.py @@ -25,7 +25,7 @@ class RawCopyPlugin(SourcePlugin): name = 'rawcopy' @classmethod - def do_install_disk(self, disk, disk_name, cr, workdir, oe_builddir, + def do_install_disk(cls, disk, disk_name, cr, workdir, oe_builddir, bootimg_dir, kernel_dir, native_sysroot): """ Called after all partitions have been prepared and assembled into a @@ -34,7 +34,7 @@ class RawCopyPlugin(SourcePlugin): pass @classmethod - def do_configure_partition(self, part, source_params, cr, cr_workdir, + def do_configure_partition(cls, part, source_params, cr, cr_workdir, oe_builddir, bootimg_dir, kernel_dir, native_sysroot): """ @@ -44,7 +44,7 @@ class RawCopyPlugin(SourcePlugin): pass @classmethod - def do_prepare_partition(self, part, source_params, cr, cr_workdir, + def do_prepare_partition(cls, part, source_params, cr, cr_workdir, oe_builddir, bootimg_dir, kernel_dir, rootfs_dir, native_sysroot): """ diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index 7d444301fb..0ee383efb7 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py @@ -54,7 +54,7 @@ class RootfsPlugin(SourcePlugin): return image_rootfs_dir @classmethod - def do_prepare_partition(self, part, source_params, cr, cr_workdir, + def do_prepare_partition(cls, part, source_params, cr, cr_workdir, oe_builddir, bootimg_dir, kernel_dir, krootfs_dir, native_sysroot): """ @@ -77,7 +77,7 @@ class RootfsPlugin(SourcePlugin): msg += " or it is not a valid path, exiting" msger.error(msg % part.rootfs) - real_rootfs_dir = self.__get_rootfs_dir(rootfs_dir) + real_rootfs_dir = cls.__get_rootfs_dir(rootfs_dir) part.set_rootfs(real_rootfs_dir) part.prepare_rootfs(cr_workdir, oe_builddir, real_rootfs_dir, native_sysroot) -- cgit 1.2.3-korg