summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2014-11-30 03:36:03 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2014-12-08 18:22:41 +0100
commit7850c1cf38154f1151259ccc39a4486d7076fdb7 (patch)
tree68cd989a18d1838779de33e9060561603cc9d8b0
parent47385e5f44a50a36a9d653903060eb7ffe2ba64e (diff)
downloadbcfg2-7850c1cf38154f1151259ccc39a4486d7076fdb7.tar.gz
bcfg2-7850c1cf38154f1151259ccc39a4486d7076fdb7.tar.bz2
bcfg2-7850c1cf38154f1151259ccc39a4486d7076fdb7.zip
Server/SSLServer: allow None as return value
-rw-r--r--src/lib/Bcfg2/Server/SSLServer.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/SSLServer.py b/src/lib/Bcfg2/Server/SSLServer.py
index 7672b539f..1f8febd0e 100644
--- a/src/lib/Bcfg2/Server/SSLServer.py
+++ b/src/lib/Bcfg2/Server/SSLServer.py
@@ -43,7 +43,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, set]:
+ if type(response) not in [bool, str, list, dict, set, type(None)]:
response = (response.decode('utf-8'), )
elif type(response) == set:
response = (list(response), )