diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-26 23:33:19 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-26 23:33:19 -0400 |
| commit | 75a16795fc460c4f83fce06a1662c3c6b19a4cfc (patch) | |
| tree | 10900e8083cf801e8115d05b11003d418b11942a | |
| parent | 4a364848c6d0e64a38d5d481ff978c519389814c (diff) | |
| download | bcfg2-75a16795fc460c4f83fce06a1662c3c6b19a4cfc.tar.gz bcfg2-75a16795fc460c4f83fce06a1662c3c6b19a4cfc.tar.bz2 bcfg2-75a16795fc460c4f83fce06a1662c3c6b19a4cfc.zip | |
testsuite: more test fixes
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/SELinux.py | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/SSLServer.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/SELinux.py b/src/lib/Bcfg2/Client/Tools/SELinux.py index fe7d09ce9..0041ce61a 100644 --- a/src/lib/Bcfg2/Client/Tools/SELinux.py +++ b/src/lib/Bcfg2/Client/Tools/SELinux.py @@ -12,7 +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 +from Bcfg2.Compat import long # pylint: disable=W0622 def pack128(int_val): diff --git a/src/lib/Bcfg2/SSLServer.py b/src/lib/Bcfg2/SSLServer.py index 2e1762ce4..7c557a4d7 100644 --- a/src/lib/Bcfg2/SSLServer.py +++ b/src/lib/Bcfg2/SSLServer.py @@ -56,7 +56,7 @@ class XMLRPCDispatcher(SimpleXMLRPCServer.SimpleXMLRPCDispatcher): self.logger.error("Unexpected handler error", exc_info=1) # report exception back to server raw_response = xmlrpclib.dumps( - xmlrpclib.Fault(1, "%s:%s" % (err[0].__name__, err[1]) + xmlrpclib.Fault(1, "%s:%s" % (err[0].__name__, err[1])), allow_none=self.allow_none, encoding=self.encoding) return raw_response |