removed passing setup and logger objects between client tools

19 files changed, 75 insertions, 91 deletions

diff --git a/src/lib/Bcfg2/Client/Client.py b/src/lib/Bcfg2/Client/Client.py
index 0488fcf21..08f56a720 100644
--- a/src/lib/Bcfg2/Client/Client.py
+++ b/src/lib/Bcfg2/Client/Client.py
@@ -280,10 +280,7 @@ class Client(object):
                     newconfig.append(bundle)
             self.config = newconfig
 
-        self.tools = Bcfg2.Client.Frame.Frame(self.config,
-                                              self.setup,
-                                              times, self.setup['drivers'],
-                                              self.setup['dryrun'])
+        self.tools = Bcfg2.Client.Frame.Frame(self.config, times)
 
         if not self.setup['omit_lock_check']:
             #check lock here
diff --git a/src/lib/Bcfg2/Client/Frame.py b/src/lib/Bcfg2/Client/Frame.py
index baf8a14f2..3f6eef893 100644
--- a/src/lib/Bcfg2/Client/Frame.py
+++ b/src/lib/Bcfg2/Client/Frame.py
@@ -7,6 +7,7 @@ import logging
 import Bcfg2.Client.Tools
 from Bcfg2.Client import prompt
 from Bcfg2.Compat import any, all  # pylint: disable=W0622
+from Bcfg2.Options import get_option_parser
 
 
 def cmpent(ent1, ent2):
@@ -48,18 +49,19 @@ def passes_black_list(entry, blacklist):
 class Frame(object):
     """Frame is the container for all Tool objects and state information."""
 
-    def __init__(self, config, setup, times, drivers, dryrun):
+    def __init__(self, config, times):
+        self.setup = get_option_parser()
         self.config = config
         self.times = times
-        self.dryrun = dryrun
+        self.dryrun = self.setup['dryrun']
         self.times['initialization'] = time.time()
-        self.setup = setup
         self.tools = []
         self.states = {}
         self.whitelist = []
         self.blacklist = []
         self.removal = []
         self.logger = logging.getLogger(__name__)
+        drivers = self.setup['drivers']
         for driver in drivers[:]:
             if driver not in Bcfg2.Client.Tools.drivers and \
                    isinstance(driver, str):
@@ -83,7 +85,7 @@ class Frame(object):
 
         for tool in list(tclass.values()):
             try:
-                self.tools.append(tool(self.logger, setup, config))
+                self.tools.append(tool(config))
             except Bcfg2.Client.Tools.ToolInstantiationError:
                 continue
             except:
diff --git a/src/lib/Bcfg2/Client/Tools/APK.py b/src/lib/Bcfg2/Client/Tools/APK.py
index 8a02b7d6d..553339fc9 100644
--- a/src/lib/Bcfg2/Client/Tools/APK.py
+++ b/src/lib/Bcfg2/Client/Tools/APK.py
@@ -12,11 +12,6 @@ class APK(Bcfg2.Client.Tools.PkgTool):
     pkgtype = 'apk'
     pkgtool = ("/sbin/apk add %s", ("%s", ["name"]))
 
-    def __init__(self, logger, setup, config):
-        Bcfg2.Client.Tools.PkgTool.__init__(self, logger, setup, config)
-        self.installed = {}
-        self.RefreshPackages()
-
     def RefreshPackages(self):
         """Refresh memory hashes of packages."""
         names = self.cmd.run("/sbin/apk info").stdout.splitlines()
diff --git a/src/lib/Bcfg2/Client/Tools/APT.py b/src/lib/Bcfg2/Client/Tools/APT.py
index 0cdefa613..e44668bf2 100644
--- a/src/lib/Bcfg2/Client/Tools/APT.py
+++ b/src/lib/Bcfg2/Client/Tools/APT.py
@@ -18,12 +18,12 @@ class APT(Bcfg2.Client.Tools.Tool):
     __handles__ = [('Package', 'deb'), ('Path', 'ignore')]
     __req__ = {'Package': ['name', 'version'], 'Path': ['type']}
 
-    def __init__(self, logger, setup, config):
-        Bcfg2.Client.Tools.Tool.__init__(self, logger, setup, config)
+    def __init__(self, config):
+        Bcfg2.Client.Tools.Tool.__init__(self, config)
 
-        self.install_path = setup.get('apt_install_path', '/usr')
-        self.var_path = setup.get('apt_var_path', '/var')
-        self.etc_path = setup.get('apt_etc_path', '/etc')
+        self.install_path = self.setup.get('apt_install_path', '/usr')
+        self.var_path = self.setup.get('apt_var_path', '/var')
+        self.etc_path = self.setup.get('apt_etc_path', '/etc')
         self.debsums = '%s/bin/debsums' % self.install_path
         self.aptget = '%s/bin/apt-get' % self.install_path
         self.dpkg = '%s/bin/dpkg' % self.install_path
diff --git a/src/lib/Bcfg2/Client/Tools/Blast.py b/src/lib/Bcfg2/Client/Tools/Blast.py
index 2627c42fe..fd594b4f4 100644
--- a/src/lib/Bcfg2/Client/Tools/Blast.py
+++ b/src/lib/Bcfg2/Client/Tools/Blast.py
@@ -13,9 +13,9 @@ class Blast(Bcfg2.Client.Tools.SYSV.SYSV):
     __handles__ = [('Package', 'blast')]
     __req__ = {'Package': ['name', 'version', 'bname']}
 
-    def __init__(self, logger, setup, config):
+    def __init__(self, config):
         # dont use the sysv constructor
-        Bcfg2.Client.Tools.PkgTool.__init__(self, logger, setup, config)
+        Bcfg2.Client.Tools.PkgTool.__init__(self, config)
         noaskfile = tempfile.NamedTemporaryFile()
         self.noaskname = noaskfile.name
         try:
diff --git a/src/lib/Bcfg2/Client/Tools/FreeBSDInit.py b/src/lib/Bcfg2/Client/Tools/FreeBSDInit.py
index 8ff26d8f3..2ab64f86d 100644
--- a/src/lib/Bcfg2/Client/Tools/FreeBSDInit.py
+++ b/src/lib/Bcfg2/Client/Tools/FreeBSDInit.py
@@ -15,8 +15,8 @@ class FreeBSDInit(Bcfg2.Client.Tools.SvcTool):
     __handles__ = [('Service', 'freebsd')]
     __req__ = {'Service': ['name', 'status']}
 
-    def __init__(self, logger, cfg, setup):
-        Bcfg2.Client.Tools.Tool.__init__(self, logger, cfg, setup)
+    def __init__(self, config):
+        Bcfg2.Client.Tools.SvcTool.__init__(self, config)
         if os.uname()[0] != 'FreeBSD':
             raise Bcfg2.Client.Tools.ToolInstantiationError
 
diff --git a/src/lib/Bcfg2/Client/Tools/IPS.py b/src/lib/Bcfg2/Client/Tools/IPS.py
index dc4d48235..e4c9d605d 100644
--- a/src/lib/Bcfg2/Client/Tools/IPS.py
+++ b/src/lib/Bcfg2/Client/Tools/IPS.py
@@ -15,14 +15,13 @@ class IPS(Bcfg2.Client.Tools.PkgTool):
     __req__ = {'Package': ['name', 'version']}
     pkgtool = ('pkg install --no-refresh %s', ('%s', ['name']))
 
-    def __init__(self, logger, setup, cfg):
+    def __init__(self, config):
         self.installed = {}
         self.pending_upgrades = set()
         self.image = image.Image()
         self.image.find_root('/', False)
         self.image.load_config()
-        Bcfg2.Client.Tools.PkgTool.__init__(self, logger, setup, cfg)
-        self.cfg = cfg
+        Bcfg2.Client.Tools.PkgTool.__init__(self, config)
 
     def RefreshPackages(self):
         self.installed = dict()
diff --git a/src/lib/Bcfg2/Client/Tools/MacPorts.py b/src/lib/Bcfg2/Client/Tools/MacPorts.py
index bc3765ec6..5b395a170 100644
--- a/src/lib/Bcfg2/Client/Tools/MacPorts.py
+++ b/src/lib/Bcfg2/Client/Tools/MacPorts.py
@@ -12,11 +12,6 @@ class MacPorts(Bcfg2.Client.Tools.PkgTool):
     pkgtype = 'macport'
     pkgtool = ('/opt/local/bin/port install %s', ('%s', ['name']))
 
-    def __init__(self, logger, setup, config):
-        Bcfg2.Client.Tools.PkgTool.__init__(self, logger, setup, config)
-        self.installed = {}
-        self.RefreshPackages()
-
     def RefreshPackages(self):
         """Refresh memory hashes of packages."""
         pkgcache = self.cmd.run(["/opt/local/bin/port",
diff --git a/src/lib/Bcfg2/Client/Tools/OpenCSW.py b/src/lib/Bcfg2/Client/Tools/OpenCSW.py
index 60e362e64..3ea9d835e 100644
--- a/src/lib/Bcfg2/Client/Tools/OpenCSW.py
+++ b/src/lib/Bcfg2/Client/Tools/OpenCSW.py
@@ -14,9 +14,9 @@ class OpenCSW(Bcfg2.Client.Tools.SYSV.SYSV):
     __handles__ = [('Package', 'opencsw')]
     __req__ = {'Package': ['name', 'version', 'bname']}
 
-    def __init__(self, logger, setup, config):
+    def __init__(self, config):
         # dont use the sysv constructor
-        Bcfg2.Client.Tools.PkgTool.__init__(self, logger, setup, config)
+        Bcfg2.Client.Tools.PkgTool.__init__(self, config)
         noaskfile = tempfile.NamedTemporaryFile()
         self.noaskname = noaskfile.name
         try:
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/__init__.py b/src/lib/Bcfg2/Client/Tools/POSIX/__init__.py
index 7708c4f72..cfb433c9c 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/__init__.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/__init__.py
@@ -14,10 +14,10 @@ class POSIX(Bcfg2.Client.Tools.Tool):
     """POSIX File support code."""
     name = 'POSIX'
 
-    def __init__(self, logger, setup, config):
-        Bcfg2.Client.Tools.Tool.__init__(self, logger, setup, config)
-        self.ppath = setup['ppath']
-        self.max_copies = setup['max_copies']
+    def __init__(self, config):
+        Bcfg2.Client.Tools.Tool.__init__(self, config)
+        self.ppath = self.setup['ppath']
+        self.max_copies = self.setup['max_copies']
         self._handlers = self._load_handlers()
         self.logger.debug("POSIX: Handlers loaded: %s" %
                           (", ".join(self._handlers.keys())))
diff --git a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
index e9db33d16..84db04b83 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
@@ -29,8 +29,8 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool):
     #: user or group
     id_mapping = dict(POSIXUser="uid", POSIXGroup="gid")
 
-    def __init__(self, logger, setup, config):
-        Bcfg2.Client.Tools.Tool.__init__(self, logger, setup, config)
+    def __init__(self, config):
+        Bcfg2.Client.Tools.Tool.__init__(self, config)
         self.set_defaults = dict(POSIXUser=self.populate_user_entry,
                                  POSIXGroup=lambda g: g)
         self._existing = None
diff --git a/src/lib/Bcfg2/Client/Tools/Pacman.py b/src/lib/Bcfg2/Client/Tools/Pacman.py
index 12785afee..fd310441c 100644
--- a/src/lib/Bcfg2/Client/Tools/Pacman.py
+++ b/src/lib/Bcfg2/Client/Tools/Pacman.py
@@ -13,11 +13,6 @@ class Pacman(Bcfg2.Client.Tools.PkgTool):
     pkgtype = 'pacman'
     pkgtool = ("/usr/bin/pacman --needed --noconfirm --noprogressbar")
 
-    def __init__(self, logger, setup, config):
-        Bcfg2.Client.Tools.PkgTool.__init__(self, logger, setup, config)
-        self.installed = {}
-        self.RefreshPackages()
-
     def RefreshPackages(self):
         '''Refresh memory hashes of packages'''
         self.installed = {}
diff --git a/src/lib/Bcfg2/Client/Tools/Portage.py b/src/lib/Bcfg2/Client/Tools/Portage.py
index 6cbcff2e0..aa1254b46 100644
--- a/src/lib/Bcfg2/Client/Tools/Portage.py
+++ b/src/lib/Bcfg2/Client/Tools/Portage.py
@@ -17,14 +17,13 @@ class Portage(Bcfg2.Client.Tools.PkgTool):
                                      ['name', 'version']))
     pkgtool = ('emerge %s', ('=%s-%s', ['name', 'version']))
 
-    def __init__(self, logger, cfg, setup):
+    def __init__(self, config):
         self._initialised = False
-        Bcfg2.Client.Tools.PkgTool.__init__(self, logger, cfg, setup)
+        Bcfg2.Client.Tools.PkgTool.__init__(self, config)
         self._initialised = True
         self.__important__ = self.__important__ + ['/etc/make.conf']
         self._pkg_pattern = re.compile('(.*)-(\d.*)')
         self._ebuild_pattern = re.compile('(ebuild|binary)')
-        self.cfg = cfg
         self.installed = {}
         self._binpkgonly = self.setup.get('portage_binpkgonly', False)
         if self._binpkgonly:
diff --git a/src/lib/Bcfg2/Client/Tools/RPM.py b/src/lib/Bcfg2/Client/Tools/RPM.py
index e9dff3db5..18eddbb44 100644
--- a/src/lib/Bcfg2/Client/Tools/RPM.py
+++ b/src/lib/Bcfg2/Client/Tools/RPM.py
@@ -29,8 +29,8 @@ class RPM(Bcfg2.Client.Tools.PkgTool):
     pkgtype = 'rpm'
     pkgtool = ("rpm --oldpackage --replacepkgs --quiet -U %s", ("%s", ["url"]))
 
-    def __init__(self, logger, setup, config):
-        Bcfg2.Client.Tools.PkgTool.__init__(self, logger, setup, config)
+    def __init__(self, config):
+        Bcfg2.Client.Tools.PkgTool.__init__(self, config)
 
         # create a global ignore list used when ignoring particular
         # files during package verification
diff --git a/src/lib/Bcfg2/Client/Tools/SELinux.py b/src/lib/Bcfg2/Client/Tools/SELinux.py
index 451495be2..e6408922f 100644
--- a/src/lib/Bcfg2/Client/Tools/SELinux.py
+++ b/src/lib/Bcfg2/Client/Tools/SELinux.py
@@ -7,11 +7,13 @@ import copy
 import glob
 import struct
 import socket
+import logging
 import selinux
 import seobject
 import Bcfg2.Client.XML
 import Bcfg2.Client.Tools
 from Bcfg2.Client.Tools.POSIX.File import POSIXFile
+from Bcfg2.Options import get_option_parser
 
 
 def pack128(int_val):
@@ -76,14 +78,13 @@ class SELinux(Bcfg2.Client.Tools.Tool):
                    SEPort=['name', 'selinuxtype'],
                    SEUser=['name', 'roles', 'prefix'])
 
-    def __init__(self, logger, setup, config):
-        Bcfg2.Client.Tools.Tool.__init__(self, logger, setup, config)
+    def __init__(self, config):
+        Bcfg2.Client.Tools.Tool.__init__(self, config)
         self.handlers = {}
         for handler in self.__handles__:
             etype = handler[0]
             self.handlers[etype] = \
-                globals()["SELinux%sHandler" % etype.title()](self, logger,
-                                                              setup, config)
+                globals()["SELinux%sHandler" % etype.title()](self, config)
         self.txn = False
         self.post_txn_queue = []
 
@@ -173,10 +174,10 @@ class SELinuxEntryHandler(object):
     custom_re = re.compile(' (?P<name>\S+)$')
     custom_format = None
 
-    def __init__(self, tool, logger, setup, config):
+    def __init__(self, tool, config):
         self.tool = tool
-        self.logger = logger
-        self.setup = setup
+        self.logger = logging.getLogger(self.__class__.__name__)
+        self.setup = get_option_parser()
         self.config = config
         self._records = None
         self._all = None
@@ -619,8 +620,8 @@ class SELinuxSeuserHandler(SELinuxEntryHandler):
     etype = "user"
     value_format = ("prefix", None, None, "roles")
 
-    def __init__(self, tool, logger, setup, config):
-        SELinuxEntryHandler.__init__(self, tool, logger, setup, config)
+    def __init__(self, tool, config):
+        SELinuxEntryHandler.__init__(self, tool, config)
         self.needs_prefix = False
 
     @property
@@ -711,9 +712,9 @@ class SELinuxSemoduleHandler(SELinuxEntryHandler):
     etype = "module"
     value_format = (None, "disabled")
 
-    def __init__(self, tool, logger, setup, config):
-        SELinuxEntryHandler.__init__(self, tool, logger, setup, config)
-        self.filetool = POSIXFile(logger, setup, config)
+    def __init__(self, tool, config):
+        SELinuxEntryHandler.__init__(self, tool, config)
+        self.filetool = POSIXFile(config)
         try:
             self.setype = selinux.selinux_getpolicytype()[1]
         except IndexError:
diff --git a/src/lib/Bcfg2/Client/Tools/SYSV.py b/src/lib/Bcfg2/Client/Tools/SYSV.py
index 38072c52e..b5afa629d 100644
--- a/src/lib/Bcfg2/Client/Tools/SYSV.py
+++ b/src/lib/Bcfg2/Client/Tools/SYSV.py
@@ -32,8 +32,8 @@ class SYSV(Bcfg2.Client.Tools.PkgTool):
     pkgtype = 'sysv'
     pkgtool = ("/usr/sbin/pkgadd %s -n -d %%s", (('%s %s', ['url', 'name'])))
 
-    def __init__(self, logger, setup, config):
-        Bcfg2.Client.Tools.PkgTool.__init__(self, logger, setup, config)
+    def __init__(self, config):
+        Bcfg2.Client.Tools.PkgTool.__init__(self, config)
         # noaskfile needs to live beyond __init__ otherwise file is removed
         self.noaskfile = tempfile.NamedTemporaryFile()
         self.noaskname = self.noaskfile.name
diff --git a/src/lib/Bcfg2/Client/Tools/YUM.py b/src/lib/Bcfg2/Client/Tools/YUM.py
index 4539a6a36..4d86ac8fe 100644
--- a/src/lib/Bcfg2/Client/Tools/YUM.py
+++ b/src/lib/Bcfg2/Client/Tools/YUM.py
@@ -3,6 +3,7 @@
 import copy
 import os.path
 import sys
+import logging
 import yum
 import yum.packages
 import yum.rpmtrans
@@ -12,6 +13,7 @@ import yum.misc
 import rpmUtils.arch
 import Bcfg2.Client.XML
 import Bcfg2.Client.Tools
+from Bcfg2.Options import get_option_parser
 
 
 def build_yname(pkgname, inst):
@@ -65,13 +67,13 @@ class RPMDisplay(yum.rpmtrans.RPMBaseCallback):
     """We subclass the default RPM transaction callback so that we
        can control Yum's verbosity and pipe it through the right logger."""
 
-    def __init__(self, logger):
+    def __init__(self):
         yum.rpmtrans.RPMBaseCallback.__init__(self)
         # we want to log events to *both* the Bcfg2 logger (which goes
         # to stderr or syslog or wherever the user wants it to go)
         # *and* the yum file logger, which will go to yum.log (ticket
         # #1103)
-        self.bcfg2_logger = logger
+        self.bcfg2_logger = logging.getLogger(self.__class__.__name__)
         self.state = None
         self.package = None
 
@@ -110,9 +112,9 @@ class YumDisplay(yum.callbacks.ProcessTransBaseCallback):
     """Class to handle display of what step we are in the Yum transaction
        such as downloading packages, etc."""
 
-    def __init__(self, logger):
+    def __init__(self):
         yum.callbacks.ProcessTransBaseCallback.__init__(self)
-        self.logger = logger
+        self.logger = logging.getLogger(self.__class__.__name__)
 
 
 class YUM(Bcfg2.Client.Tools.PkgTool):
@@ -128,9 +130,9 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
 
     conflicts = ['RPM']
 
-    def __init__(self, logger, setup, config):
-        self.yumbase = self._loadYumBase(setup=setup, logger=logger)
-        Bcfg2.Client.Tools.PkgTool.__init__(self, logger, setup, config)
+    def __init__(self, config):
+        self.yumbase = self._loadYumBase()
+        Bcfg2.Client.Tools.PkgTool.__init__(self, config)
         self.ignores = [entry.get('name') for struct in config \
                         for entry in struct \
                         if entry.tag == 'Path' and \
@@ -190,22 +192,23 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
         self.logger.debug("Yum: installonlypkgs: %s" % self.installonlypkgs)
         self.logger.debug("Yum: verify_flags: %s" % self.verify_flags)
 
-    def _loadYumBase(self, setup=None, logger=None):
+    def _loadYumBase(self):
         ''' this may be called before PkgTool.__init__() is called on
         this object (when the YUM object is first instantiated;
         PkgTool.__init__() calls RefreshPackages(), which requires a
         YumBase object already exist), or after __init__() has
         completed, when we reload the yum config before installing
-        packages. Consequently, we support both methods by allowing
-        setup and logger, the only object properties we use in this
-        function, to be passed as keyword arguments or to be omitted
-        and drawn from the object itself.'''
+        packages. '''
         rv = yum.YumBase()  # pylint: disable=C0103
 
-        if setup is None:
+        if hasattr(self, "setup"):
             setup = self.setup
-        if logger is None:
+        else:
+            setup = get_option_parser()
+        if hasattr(self, "logger"):
             logger = self.logger
+        else:
+            logger = logging.getLogger(self.name)
 
         if setup['debug']:
             debuglevel = 3
@@ -744,8 +747,8 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
             self.yumbase.closeRpmDB()
             self.RefreshPackages()
 
-        rpm_display = RPMDisplay(self.logger)
-        yum_display = YumDisplay(self.logger)
+        rpm_display = RPMDisplay()
+        yum_display = YumDisplay()
         # Run the Yum Transaction
         try:
             rescode, restring = self.yumbase.buildTransaction()
diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py
index d197354a3..f604e6198 100644
--- a/src/lib/Bcfg2/Client/Tools/__init__.py
+++ b/src/lib/Bcfg2/Client/Tools/__init__.py
@@ -3,8 +3,10 @@
 import os
 import sys
 import stat
+import logging
 import Bcfg2.Client
 import Bcfg2.Client.XML
+from Bcfg2.Options import get_option_parser
 from Bcfg2.Utils import Executor, ClassName
 from Bcfg2.Compat import walk_packages  # pylint: disable=W0622
 
@@ -78,23 +80,19 @@ class Tool(object):
     #: runtime with a warning.
     conflicts = []
 
-    def __init__(self, logger, setup, config):
+    def __init__(self, config):
         """
-        :param logger: Logger that will be used for logging by this tool
-        :type logger: logging.Logger
-        :param setup: The option set Bcfg2 was invoked with
-        :type setup: Bcfg2.Options.OptionParser
         :param config: The XML configuration for this client
         :type config: lxml.etree._Element
         :raises: :exc:`Bcfg2.Client.Tools.ToolInstantiationError`
         """
         #: A :class:`Bcfg2.Options.OptionParser` object describing the
         #: option set Bcfg2 was invoked with
-        self.setup = setup
+        self.setup = get_option_parser()
 
         #: A :class:`logging.Logger` object that will be used by this
         #: tool for logging
-        self.logger = logger
+        self.logger = logging.getLogger(self.name)
 
         #: The XML configuration for this client
         self.config = config
@@ -397,8 +395,8 @@ class PkgTool(Tool):
     #: The ``type`` attribute of Packages handled by this tool.
     pkgtype = 'echo'
 
-    def __init__(self, logger, setup, config):
-        Tool.__init__(self, logger, setup, config)
+    def __init__(self, config):
+        Tool.__init__(self, config)
 
         #: A dict of installed packages; the keys should be package
         #: names and the values should be simple strings giving the
@@ -501,8 +499,8 @@ class PkgTool(Tool):
 class SvcTool(Tool):
     """ Base class for tools that handle Service entries """
 
-    def __init__(self, logger, setup, config):
-        Tool.__init__(self, logger, setup, config)
+    def __init__(self, config):
+        Tool.__init__(self, config)
         #: List of services that have been restarted
         self.restarted = []
     __init__.__doc__ = Tool.__init__.__doc__
diff --git a/src/lib/Bcfg2/Client/Tools/launchd.py b/src/lib/Bcfg2/Client/Tools/launchd.py
index b0661b26b..64aa45e4e 100644
--- a/src/lib/Bcfg2/Client/Tools/launchd.py
+++ b/src/lib/Bcfg2/Client/Tools/launchd.py
@@ -12,8 +12,8 @@ class launchd(Bcfg2.Client.Tools.Tool):  # pylint: disable=C0103
     __execs__ = ['/bin/launchctl', '/usr/bin/defaults']
     __req__ = {'Service': ['name', 'status']}
 
-    def __init__(self, logger, setup, config):
-        Bcfg2.Client.Tools.Tool.__init__(self, logger, setup, config)
+    def __init__(self, config):
+        Bcfg2.Client.Tools.Tool.__init__(self, config)
 
         # Locate plist file that provides given reverse-fqdn name:
         #