summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugin/helpers.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-04-24 15:44:06 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-04-25 10:45:14 -0400
commit044213c789c4f1ee214da3d70f02352b1aaa8673 (patch)
treefeb62ab035d27773f20be1e052a177c0c61299aa /src/lib/Bcfg2/Server/Plugin/helpers.py
parent0ff6b2788de683dd89203c7ae1393ea922a62c32 (diff)
downloadbcfg2-044213c789c4f1ee214da3d70f02352b1aaa8673.tar.gz
bcfg2-044213c789c4f1ee214da3d70f02352b1aaa8673.tar.bz2
bcfg2-044213c789c4f1ee214da3d70f02352b1aaa8673.zip
Fixing unit tests
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugin/helpers.py')
-rw-r--r--src/lib/Bcfg2/Server/Plugin/helpers.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py
index e5ea5188a..ade14b865 100644
--- a/src/lib/Bcfg2/Server/Plugin/helpers.py
+++ b/src/lib/Bcfg2/Server/Plugin/helpers.py
@@ -6,7 +6,6 @@ import sys
import copy
import glob
import genshi
-import logging
import operator
import lxml.etree
import Bcfg2.Server
@@ -30,6 +29,7 @@ try:
except ImportError:
HAS_DJANGO = False
+
class track_statistics(object): # pylint: disable=C0103
""" Decorator that tracks execution time for the given
:class:`Plugin` method with :mod:`Bcfg2.Statistics` for reporting
@@ -1221,7 +1221,7 @@ class Specificity(CmpMixin):
return "".join(rv)
-class SpecificData(object):
+class SpecificData(Debuggable):
""" A file that is specific to certain clients, groups, or all
clients. """
@@ -1237,6 +1237,7 @@ class SpecificData(object):
:param encoding: The encoding to use for data in this file
:type encoding: string
"""
+ Debuggable.__init__(self)
self.name = name
self.specific = specific
self.data = None
@@ -1258,7 +1259,7 @@ class SpecificData(object):
except UnicodeDecodeError:
self.data = open(self.name, mode='rb').read()
except: # pylint: disable=W0201
- LOGGER.error("Failed to read file %s" % self.name)
+ self.logger.error("Failed to read file %s" % self.name)
class EntrySet(Debuggable):