testsuite: more text fixes

12 files changed, 32 insertions, 14 deletions

diff --git a/doc/development/compat.txt b/doc/development/compat.txt
index 90df45676..f90274ce5 100644
--- a/doc/development/compat.txt
+++ b/doc/development/compat.txt
@@ -100,6 +100,8 @@ behavior (e.g., :func:`input`) do not cause unexpected side-effects.
 +---------------------------------+--------------------------------------------------+---------------------------------------------------------+
 | long                            | :func:`long`                                     | :func:`int`                                             |
 +---------------------------------+--------------------------------------------------+---------------------------------------------------------+
+| cmp                             | :func:`cmp`                                      | Not implemented                                         |
++---------------------------------+--------------------------------------------------+---------------------------------------------------------+
 
 Python 2.4 compatibility
 ------------------------
diff --git a/src/lib/Bcfg2/Client/Frame.py b/src/lib/Bcfg2/Client/Frame.py
index fe4943fdf..ada5320b8 100644
--- a/src/lib/Bcfg2/Client/Frame.py
+++ b/src/lib/Bcfg2/Client/Frame.py
@@ -6,7 +6,7 @@ import fnmatch
 import logging
 import Bcfg2.Client.Tools
 from Bcfg2.Client import prompt
-from Bcfg2.Compat import any, all  # pylint: disable=W0622
+from Bcfg2.Compat import any, all, cmp  # pylint: disable=W0622
 
 
 def cmpent(ent1, ent2):
diff --git a/src/lib/Bcfg2/Client/Tools/SELinux.py b/src/lib/Bcfg2/Client/Tools/SELinux.py
index 617b7c2ef..fe7d09ce9 100644
--- a/src/lib/Bcfg2/Client/Tools/SELinux.py
+++ b/src/lib/Bcfg2/Client/Tools/SELinux.py
@@ -12,6 +12,7 @@ import seobject
 import Bcfg2.Client.XML
 import Bcfg2.Client.Tools
 from Bcfg2.Client.Tools.POSIX.File import POSIXFile
+from Bcfg2.Compat import long
 
 
 def pack128(int_val):
@@ -47,7 +48,7 @@ def netmask_itoa(netmask, proto="ipv4"):
     if netmask > size:
         raise ValueError("Netmask too large: %s" % netmask)
 
-    res = 0L
+    res = long(0)
     for i in range(netmask):
         res |= 1 << (size - i - 1)
     netmask = socket.inet_ntop(family, pack128(res))
diff --git a/src/lib/Bcfg2/Compat.py b/src/lib/Bcfg2/Compat.py
index 44c76303c..47f62e26b 100644
--- a/src/lib/Bcfg2/Compat.py
+++ b/src/lib/Bcfg2/Compat.py
@@ -10,7 +10,7 @@ Python 2.4 and such-like """
 
 import sys
 
-# pylint: disable=E0611,W0611,W0622,C0103
+# pylint: disable=E0601,E0602,E0611,W0611,W0622,C0103
 
 try:
     from email.Utils import formatdate
@@ -270,3 +270,11 @@ try:
 except NameError:
     # longs are just ints in py3k
     long = int
+
+
+try:
+    cmp
+except NameError:
+    def cmp(a, b):
+        """ Py3k implementation of cmp() """
+        return (a > b) - (a < b)
diff --git a/src/lib/Bcfg2/Proxy.py b/src/lib/Bcfg2/Proxy.py
index 62b83d0b4..b2b9fcc2e 100644
--- a/src/lib/Bcfg2/Proxy.py
+++ b/src/lib/Bcfg2/Proxy.py
@@ -326,6 +326,7 @@ class XMLRPCTransport(xmlrpclib.Transport):
         return self.parse_response(response)
 
     if sys.hexversion < 0x03000000:
+        # pylint: disable=E1101
         def send_request(self, host, handler, request_body, debug):
             """ send_request() changed significantly in py3k."""
             conn = self.make_connection(host)
@@ -334,6 +335,7 @@ class XMLRPCTransport(xmlrpclib.Transport):
             self.send_user_agent(conn)
             self.send_content(conn, request_body)
             return conn
+        # pylint: enable=E1101
 
 
 def ComponentProxy(url, user=None, password=None, key=None, cert=None, ca=None,
diff --git a/src/lib/Bcfg2/SSLServer.py b/src/lib/Bcfg2/SSLServer.py
index a149b676f..2e1762ce4 100644
--- a/src/lib/Bcfg2/SSLServer.py
+++ b/src/lib/Bcfg2/SSLServer.py
@@ -52,10 +52,11 @@ class XMLRPCDispatcher(SimpleXMLRPCServer.SimpleXMLRPCDispatcher):
                                            allow_none=self.allow_none,
                                            encoding=self.encoding)
         except:
+            err = sys.exc_info()
             self.logger.error("Unexpected handler error", exc_info=1)
             # report exception back to server
             raw_response = xmlrpclib.dumps(
-                xmlrpclib.Fault(1, "%s:%s" % (sys.exc_type, sys.exc_value)),
+                xmlrpclib.Fault(1, "%s:%s" % (err[0].__name__, err[1])
                 allow_none=self.allow_none, encoding=self.encoding)
         return raw_response
 
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py
index b181c2237..7561aec1e 100644
--- a/src/lib/Bcfg2/Server/Plugins/Metadata.py
+++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py
@@ -75,6 +75,7 @@ if HAS_DJANGO:
                 yield client.hostname
 
         def keys(self):
+            """ Get keys for the mapping """
             return [c.hostname for c in MetadataClientModel.objects.all()]
 
         def __contains__(self, key):
diff --git a/src/lib/Bcfg2/Server/Plugins/Ohai.py b/src/lib/Bcfg2/Server/Plugins/Ohai.py
index 8a1b07ac8..1ec3cbd60 100644
--- a/src/lib/Bcfg2/Server/Plugins/Ohai.py
+++ b/src/lib/Bcfg2/Server/Plugins/Ohai.py
@@ -33,20 +33,22 @@ class OhaiCache(object):
         self.dirname = dirname
         self.cache = dict()
 
-    def itempath(self, item):
-        return os.path.join(self.dirname, "%s.json" % item)
+    def hostpath(self, host):
+        """ Get the path to the file that contains Ohai data for the
+        given host """
+        return os.path.join(self.dirname, "%s.json" % host)
 
     def __setitem__(self, item, value):
         if value is None:
             # simply return if the client returned nothing
             return
         self.cache[item] = json.loads(value)
-        open(self.itempath(item), 'w').write(value)
+        open(self.hostpath(item), 'w').write(value)
 
     def __getitem__(self, item):
         if item not in self.cache:
             try:
-                data = open(self.itempath(item)).read()
+                data = open(self.hostpath(item)).read()
             except:
                 raise KeyError(item)
             self.cache[item] = json.loads(data)
@@ -56,13 +58,13 @@ class OhaiCache(object):
         if item in self.cache:
             del self.cache[item]
         try:
-            os.unlink(self.itempath(item))
+            os.unlink(self.hostpath(item))
         except:
-            raise IndexError("Could not unlink %s: %s" % (self.itempath(item),
+            raise IndexError("Could not unlink %s: %s" % (self.hostpath(item),
                                                           sys.exc_info()[1]))
 
     def __len__(self):
-        return len(glob.glob(self.itempath('*')))
+        return len(glob.glob(self.hostpath('*')))
 
     def __iter__(self):
         data = list(self.cache.keys())
diff --git a/src/lib/Bcfg2/Utils.py b/src/lib/Bcfg2/Utils.py
index ed5c0a377..39cf5255e 100644
--- a/src/lib/Bcfg2/Utils.py
+++ b/src/lib/Bcfg2/Utils.py
@@ -210,7 +210,7 @@ class Executor(object):
         :type timeout: float
         :returns: :class:`Bcfg2.Utils.ExecutorResult`
         """
-        if isinstance(command, basestring):
+        if isinstance(command, str):
             cmdstr = command
         else:
             cmdstr = " ".join(command)
diff --git a/src/sbin/bcfg2-build-reports b/src/sbin/bcfg2-build-reports
index 27e7c2475..1c9e9ad97 100755
--- a/src/sbin/bcfg2-build-reports
+++ b/src/sbin/bcfg2-build-reports
@@ -13,7 +13,7 @@ import sys
 from time import asctime, strptime
 from lxml.etree import XML, XSLT, parse, Element, ElementTree, SubElement, tostring, XMLSyntaxError
 # Compatibility imports
-from Bcfg2.Compat import ConfigParser
+from Bcfg2.Compat import ConfigParser, cmp
 
 def generatereport(rspec, nrpt):
     """
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgGenshiGenerator.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgGenshiGenerator.py
index 385f8df77..2e8b7bfa5 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgGenshiGenerator.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgGenshiGenerator.py
@@ -2,6 +2,7 @@ import os
 import sys
 import lxml.etree
 from mock import Mock, MagicMock, patch
+import Bcfg2.Server.Plugins.Cfg.CfgGenshiGenerator
 from Bcfg2.Server.Plugins.Cfg.CfgGenshiGenerator import *
 from Bcfg2.Server.Plugin import PluginExecutionError
 
diff --git a/testsuite/requirements.txt b/testsuite/requirements.txt
index c59810a99..42862b4ef 100644
--- a/testsuite/requirements.txt
+++ b/testsuite/requirements.txt
@@ -2,6 +2,6 @@ lxml
 nose
 mock
 sphinx
-daemon
+python-daemon
 pylint
 pep8