From 1e822b85fbd6930c57345a3d9b10ca7655876bb2 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Thu, 15 Sep 2011 08:48:33 -0500 Subject: SSLServer: Fix traceback in bcfg2-admin perf (#1042) Signed-off-by: Sol Jerome --- src/lib/SSLServer.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/SSLServer.py b/src/lib/SSLServer.py index 21bf48d3e..f66d89c62 100644 --- a/src/lib/SSLServer.py +++ b/src/lib/SSLServer.py @@ -47,11 +47,10 @@ class XMLRPCDispatcher (SimpleXMLRPCServer.SimpleXMLRPCDispatcher): params = (address, ) + params response = self.instance._dispatch(method, params, self.funcs) # py3k compatibility - if isinstance(response, bool) or isinstance(response, str) \ - or isinstance(response, list): - response = (response, ) - else: + if type(response) is bytes: response = (response.decode('utf-8'), ) + else: + response = (response, ) raw_response = xmlrpclib.dumps(response, methodresponse=1, allow_none=self.allow_none, encoding=self.encoding) -- cgit v1.2.3-1-g7c22