From: Ed Bartosh <ed.bartosh@linux.intel.com>
Date: Wed, 4 May 2016 13:06:17 +0000 (+0300)
Subject: wic: don't inherit classes from object
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~25857
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a146b03ee7d0aa5bc1722da5977a5952782b69bf;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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 <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/scripts/lib/wic/creator.py b/scripts/lib/wic/creator.py
index d0158fb62f6..d4972e889b3 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 557f5366770..463ae931367 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 10d0d7c1155..27bc1c7ee40 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 6d21193902e..34fd7d6a721 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 933647d7c72..83af9b05dfc 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 89a7c137588..8f4db4e17d2 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.