From a146b03ee7d0aa5bc1722da5977a5952782b69bf Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 4 May 2016 16:06:17 +0300 Subject: wic: don't inherit classes from object All classes in Python3 are new style classes and don't need to be inherited from object. Wic code works fine without this inheritance even with Python2, so it's harmless to remove it. [YOCTO #9412] Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- scripts/lib/wic/creator.py | 2 +- scripts/lib/wic/imager/baseimager.py | 2 +- scripts/lib/wic/ksparser.py | 2 +- scripts/lib/wic/partition.py | 2 +- scripts/lib/wic/plugin.py | 2 +- scripts/lib/wic/utils/partitionedfs.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/lib/wic/creator.py b/scripts/lib/wic/creator.py index d0158fb62f..d4972e889b 100644 --- a/scripts/lib/wic/creator.py +++ b/scripts/lib/wic/creator.py @@ -24,7 +24,7 @@ from wic.conf import configmgr from wic.plugin import pluginmgr -class Creator(object): +class Creator(): """${name}: create an image Usage: diff --git a/scripts/lib/wic/imager/baseimager.py b/scripts/lib/wic/imager/baseimager.py index 557f536677..463ae93136 100644 --- a/scripts/lib/wic/imager/baseimager.py +++ b/scripts/lib/wic/imager/baseimager.py @@ -25,7 +25,7 @@ from wic import msger from wic.utils.errors import CreatorError from wic.utils import runner -class BaseImageCreator(object): +class BaseImageCreator(): """Base class for image creation. BaseImageCreator is the simplest creator class available; it will diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py index 10d0d7c115..27bc1c7ee4 100644 --- a/scripts/lib/wic/ksparser.py +++ b/scripts/lib/wic/ksparser.py @@ -110,7 +110,7 @@ def systemidtype(arg): return arg -class KickStart(object): +class KickStart(): """"Kickstart parser implementation.""" def __init__(self, confpath): diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index 6d21193902..34fd7d6a72 100644 --- a/scripts/lib/wic/partition.py +++ b/scripts/lib/wic/partition.py @@ -38,7 +38,7 @@ partition_methods = { "do_configure_partition":None, } -class Partition(object): +class Partition(): def __init__(self, args, lineno): self.args = args diff --git a/scripts/lib/wic/plugin.py b/scripts/lib/wic/plugin.py index 933647d7c7..83af9b05df 100644 --- a/scripts/lib/wic/plugin.py +++ b/scripts/lib/wic/plugin.py @@ -29,7 +29,7 @@ PLUGIN_TYPES = ["imager", "source"] PLUGIN_DIR = "/lib/wic/plugins" # relative to scripts SCRIPTS_PLUGIN_DIR = "scripts" + PLUGIN_DIR -class PluginMgr(object): +class PluginMgr(): plugin_dirs = {} # make the manager class as singleton diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py index 89a7c13758..8f4db4e17d 100644 --- a/scripts/lib/wic/utils/partitionedfs.py +++ b/scripts/lib/wic/utils/partitionedfs.py @@ -33,7 +33,7 @@ GPT_OVERHEAD = 34 # Size of a sector in bytes SECTOR_SIZE = 512 -class Image(object): +class Image(): """ Generic base object for an image. -- cgit 1.2.3-korg