diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2011-09-15 08:48:33 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-09-15 10:52:37 -0500 |
| commit | 1e822b85fbd6930c57345a3d9b10ca7655876bb2 (patch) | |
| tree | 7ebd5084c23ca8546534c4564e8f99fbc4e17a26 | |
| parent | 2206f139b86ec895698d539375027720ffa74ebb (diff) | |
| download | bcfg2-1e822b85fbd6930c57345a3d9b10ca7655876bb2.tar.gz bcfg2-1e822b85fbd6930c57345a3d9b10ca7655876bb2.tar.bz2 bcfg2-1e822b85fbd6930c57345a3d9b10ca7655876bb2.zip | |
SSLServer: Fix traceback in bcfg2-admin perf (#1042)
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| -rw-r--r-- | src/lib/SSLServer.py | 7 |
1 files 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) |