summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2011-10-13 10:34:02 -0500
committerSol Jerome <sol.jerome@gmail.com>2011-10-13 10:34:02 -0500
commitbc3c8995733497bcd8b81ceec98eddc90d6a8ea2 (patch)
tree59ae12f0a1523f98ed2a08879a17f450b0436e84 /src
parent5f878bfc6c6c33ffaea193502f205f86a893694f (diff)
downloadbcfg2-bc3c8995733497bcd8b81ceec98eddc90d6a8ea2.tar.gz
bcfg2-bc3c8995733497bcd8b81ceec98eddc90d6a8ea2.tar.bz2
bcfg2-bc3c8995733497bcd8b81ceec98eddc90d6a8ea2.zip
SSLServer: Fix traceback in xcmd toggle_debug
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/lib/SSLServer.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/SSLServer.py b/src/lib/SSLServer.py
index 6d053b802..32ab9933b 100644
--- a/src/lib/SSLServer.py
+++ b/src/lib/SSLServer.py
@@ -16,6 +16,7 @@ import logging
import ssl
import threading
import time
+import types
# Compatibility imports
from Bcfg2.Bcfg2Py3k import xmlrpclib, SimpleXMLRPCServer, SocketServer
@@ -47,7 +48,7 @@ class XMLRPCDispatcher (SimpleXMLRPCServer.SimpleXMLRPCDispatcher):
params = (address, ) + params
response = self.instance._dispatch(method, params, self.funcs)
# py3k compatibility
- if type(response) not in [bool, str, list, dict]:
+ if type(response) not in [bool, str, list, dict, types.NoneType]:
response = (response.decode('utf-8'), )
else:
response = (response, )