3 files changed, 7 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py
index ae3b84fc2..827c884d2 100644
--- a/src/lib/Bcfg2/Server/Plugin/helpers.py
+++ b/src/lib/Bcfg2/Server/Plugin/helpers.py
@@ -1171,7 +1171,7 @@ class SpecificData(object):
         except UnicodeDecodeError:
             self.data = open(self.name, mode='rb').read()
         except:  # pylint: disable=W0201
-            self.logger.error("Failed to read file %s" % self.name)
+            LOGGER.error("Failed to read file %s" % self.name)
 
 
 class EntrySet(Debuggable):
diff --git a/src/lib/Bcfg2/Server/Plugin/interfaces.py b/src/lib/Bcfg2/Server/Plugin/interfaces.py
index c1dbb1578..3ef29775d 100644
--- a/src/lib/Bcfg2/Server/Plugin/interfaces.py
+++ b/src/lib/Bcfg2/Server/Plugin/interfaces.py
@@ -531,7 +531,7 @@ class Version(Plugin):
     #: be ".svn"
     __vcs_metadata_path__ = None
 
-    __rmi__ = Bcfg2.Server.Plugin.Version.__rmi__ + ['get_revision']
+    __rmi__ = Plugin.__rmi__ + ['get_revision']
 
     def __init__(self, core, datastore):
         Plugin.__init__(self, core, datastore)
@@ -602,7 +602,7 @@ class ClientACLs(object):
     """ ClientACLs are used to grant or deny access to different
     XML-RPC calls based on client IP or metadata. """
 
-    def check_acl_ip(self, address, rmi):
+    def check_acl_ip(self, address, rmi):  # pylint: disable=W0613
         """ Check if the given IP address is authorized to make the
         named XML-RPC call.
 
@@ -615,7 +615,7 @@ class ClientACLs(object):
         """
         return True
 
-    def check_acl_metadata(self, metadata, rmi):
+    def check_acl_metadata(self, metadata, rmi):  # pylint: disable=W0613
         """ Check if the given client is authorized to make the named
         XML-RPC call.
 
diff --git a/src/lib/Bcfg2/__init__.py b/src/lib/Bcfg2/__init__.py
new file mode 100644
index 000000000..3fe2a0d75
--- /dev/null
+++ b/src/lib/Bcfg2/__init__.py
@@ -0,0 +1,3 @@
+"""Base modules definition."""
+
+__all__ = ['Server', 'Client', 'Logger', 'Options', 'Proxy', 'Statistics']