summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-05-04 16:06:17 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-14 23:05:13 +0100
commitdac0e809b71323318e0f6501a9f67c303438a236 (patch)
treefde7db3da2c2552aaeb80c57aebb91b083a5a204
parent52ce79dcba4c161509a6cc3ee3afe5cd6a99d53f (diff)
downloadpoky-dac0e809b71323318e0f6501a9f67c303438a236.tar.gz
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] (From OE-Core rev: a146b03ee7d0aa5bc1722da5977a5952782b69bf) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/wic/creator.py2
-rw-r--r--scripts/lib/wic/imager/baseimager.py2
-rw-r--r--scripts/lib/wic/ksparser.py2
-rw-r--r--scripts/lib/wic/partition.py2
-rw-r--r--scripts/lib/wic/plugin.py2
-rw-r--r--scripts/lib/wic/utils/partitionedfs.py2
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
24from wic.plugin import pluginmgr 24from wic.plugin import pluginmgr
25 25
26 26
27class Creator(object): 27class Creator():
28 """${name}: create an image 28 """${name}: create an image
29 29
30 Usage: 30 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
25from wic.utils.errors import CreatorError 25from wic.utils.errors import CreatorError
26from wic.utils import runner 26from wic.utils import runner
27 27
28class BaseImageCreator(object): 28class BaseImageCreator():
29 """Base class for image creation. 29 """Base class for image creation.
30 30
31 BaseImageCreator is the simplest creator class available; it will 31 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):
110 110
111 return arg 111 return arg
112 112
113class KickStart(object): 113class KickStart():
114 """"Kickstart parser implementation.""" 114 """"Kickstart parser implementation."""
115 115
116 def __init__(self, confpath): 116 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 = {
38 "do_configure_partition":None, 38 "do_configure_partition":None,
39} 39}
40 40
41class Partition(object): 41class Partition():
42 42
43 def __init__(self, args, lineno): 43 def __init__(self, args, lineno):
44 self.args = args 44 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"]
29PLUGIN_DIR = "/lib/wic/plugins" # relative to scripts 29PLUGIN_DIR = "/lib/wic/plugins" # relative to scripts
30SCRIPTS_PLUGIN_DIR = "scripts" + PLUGIN_DIR 30SCRIPTS_PLUGIN_DIR = "scripts" + PLUGIN_DIR
31 31
32class PluginMgr(object): 32class PluginMgr():
33 plugin_dirs = {} 33 plugin_dirs = {}
34 34
35 # make the manager class as singleton 35 # 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
33# Size of a sector in bytes 33# Size of a sector in bytes
34SECTOR_SIZE = 512 34SECTOR_SIZE = 512
35 35
36class Image(object): 36class Image():
37 """ 37 """
38 Generic base object for an image. 38 Generic base object for an image.
39 39