Skip to content

Commit eafa718

Browse files
committed
Remove inherit from object as it's no longer needed to determine new-style classes
1 parent acf4bc9 commit eafa718

14 files changed

+14
-14
lines changed

v2/ansible/executor/HostLog.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from __future__ import (absolute_import, division, print_function)
2020
__metaclass__ = type
2121

22-
class HostLog(object):
22+
class HostLog:
2323

2424
def __init__(self, host):
2525
self.host = host

v2/ansible/executor/HostPlaybookIterator.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from __future__ import (absolute_import, division, print_function)
2020
__metaclass__ = type
2121

22-
class HostPlaybookIterator(object):
22+
class HostPlaybookIterator:
2323

2424
def __init__(self, host, playbook):
2525
pass

v2/ansible/executor/PlaybookExecutor.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from __future__ import (absolute_import, division, print_function)
2020
__metaclass__ = type
2121

22-
class PlaybookExecutor(object):
22+
class PlaybookExecutor:
2323

2424
def __init__(self, list_of_plays=[]):
2525
# self.tqm = TaskQueueManager(forks)

v2/ansible/executor/TaskExecutor.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from __future__ import (absolute_import, division, print_function)
2020
__metaclass__ = type
2121

22-
class TaskExecutor(object):
22+
class TaskExecutor:
2323

2424
def __init__(self, task, host):
2525
pass

v2/ansible/executor/TaskQueueManager.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from __future__ import (absolute_import, division, print_function)
2020
__metaclass__ = type
2121

22-
class TaskQueueManagerHostPlaybookIterator(object):
22+
class TaskQueueManagerHostPlaybookIterator:
2323

2424
def __init__(self, host, playbook):
2525
pass

v2/ansible/inventory/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from __future__ import (absolute_import, division, print_function)
2222
__metaclass__ = type
2323

24-
class Inventory(object):
24+
class Inventory:
2525
def __init__(self, host_list=C.DEFAULT_HOST_LIST, vault_password=None):
2626
pass
2727
def get_hosts(self, pattern="all"):

v2/ansible/parsing/mod_args.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from ansible.plugins import module_finder
2626
from ansible.parsing.splitter import parse_kv
2727

28-
class ModuleArgsParser(object):
28+
class ModuleArgsParser:
2929

3030
"""
3131
There are several ways a module and argument set can be expressed:

v2/ansible/parsing/yaml/objects.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from __future__ import (absolute_import, division, print_function)
2020
__metaclass__ = type
2121

22-
class AnsibleBaseYAMLObject(object):
22+
class AnsibleBaseYAMLObject:
2323
'''
2424
the base class used to sub-class python built-in objects
2525
so that we can add attributes to them during yaml parsing

v2/ansible/playbook/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from __future__ import (absolute_import, division, print_function)
2020
__metaclass__ = type
2121

22-
class Playbook(object):
22+
class Playbook:
2323
def __init__(self, filename):
2424
self.ds = v2.utils.load_yaml_from_file(filename)
2525
self.plays = []

v2/ansible/playbook/attribute.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#from ansible.common.errors import AnsibleError
2323

24-
class Attribute(object):
24+
class Attribute:
2525

2626
def __init__(self, isa=None, private=False, default=None):
2727

v2/ansible/playbook/base.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from ansible.playbook.attribute import Attribute, FieldAttribute
2727
from ansible.parsing import load as ds_load
2828

29-
class Base(object):
29+
class Base:
3030

3131
def __init__(self):
3232

v2/ansible/playbook/conditional.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from __future__ import (absolute_import, division, print_function)
2020
__metaclass__ = type
2121

22-
class Conditional(object):
22+
class Conditional:
2323

2424
def __init__(self, task):
2525
self._task = task

v2/ansible/playbook/tag.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from errors import AnsibleError
2323
from ansible.utils import list_union
2424

25-
class Tag(object):
25+
class Tag:
2626
def __init__(self, tags=[]):
2727
assert isinstance(tags, list)
2828
self._tags = tags

v2/ansible/plugins/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def push_basedir(basedir):
3939
if basedir not in _basedirs:
4040
_basedirs.insert(0, basedir)
4141

42-
class PluginLoader(object):
42+
class PluginLoader:
4343

4444
'''
4545
PluginLoader loads plugins from the configured plugin directories.

0 commit comments

Comments
 (0)