added module-level OptionParser to avoid passing it as an argument or global all over

1 files changed, 8 insertions, 14 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Properties.py b/src/lib/Bcfg2/Server/Plugins/Properties.py
index a51dd8adc..c5b5ea2d1 100644
--- a/src/lib/Bcfg2/Server/Plugins/Properties.py
+++ b/src/lib/Bcfg2/Server/Plugins/Properties.py
@@ -7,6 +7,7 @@ import sys
 import copy
 import logging
 import lxml.etree
+from Bcfg2.Options import get_option_parser
 import Bcfg2.Server.Plugin
 from Bcfg2.Server.Plugin import PluginExecutionError
 try:
@@ -33,8 +34,6 @@ except ImportError:
 
 LOGGER = logging.getLogger(__name__)
 
-SETUP = None
-
 
 class PropertyFile(object):
     """ Base Properties file handler """
@@ -46,13 +45,14 @@ class PropertyFile(object):
         .. automethod:: _write
         """
         self.name = name
+        self.setup = get_option_parser()
 
     def write(self):
         """ Write the data in this data structure back to the property
         file. This public method performs checking to ensure that
         writing is possible and then calls :func:`_write`. """
-        if not SETUP.cfp.getboolean("properties", "writes_enabled",
-                                    default=True):
+        if not self.setup.cfp.getboolean("properties", "writes_enabled",
+                                         default=True):
             msg = "Properties files write-back is disabled in the " + \
                 "configuration"
             LOGGER.error(msg)
@@ -232,26 +232,22 @@ class XMLPropertyFile(Bcfg2.Server.Plugin.StructFile, PropertyFile):
         """ Decrypt a single encrypted properties file element """
         if not element.text or not element.text.strip():
             return
-        passes = Bcfg2.Encryption.get_passphrases(SETUP)
+        passes = Bcfg2.Encryption.get_passphrases()
         try:
             passphrase = passes[element.get("encrypted")]
             try:
-                return Bcfg2.Encryption.ssl_decrypt(
-                    element.text, passphrase,
-                    algorithm=Bcfg2.Encryption.get_algorithm(SETUP))
+                return Bcfg2.Encryption.ssl_decrypt(element.text, passphrase)
             except Bcfg2.Encryption.EVPError:
                 # error is raised below
                 pass
         except KeyError:
             # bruteforce_decrypt raises an EVPError with a sensible
             # error message, so we just let it propagate up the stack
-            return Bcfg2.Encryption.bruteforce_decrypt(
-                element.text, passphrases=passes.values(),
-                algorithm=Bcfg2.Encryption.get_algorithm(SETUP))
+            return Bcfg2.Encryption.bruteforce_decrypt(element.text)
         raise Bcfg2.Encryption.EVPError("Failed to decrypt")
 
     def get_additional_data(self, metadata):
-        if SETUP.cfp.getboolean("properties", "automatch", default=False):
+        if self.setup.cfp.getboolean("properties", "automatch", default=False):
             default_automatch = "true"
         else:
             default_automatch = "false"
@@ -323,10 +319,8 @@ class Properties(Bcfg2.Server.Plugin.Plugin,
     instances. """
 
     def __init__(self, core, datastore):
-        global SETUP  # pylint: disable=W0603
         Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
         Bcfg2.Server.Plugin.Connector.__init__(self)
-        SETUP = core.setup
         try:
             self.store = PropDirectoryBacked(self.data, core.fam)
         except OSError: