diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2012-04-24 14:51:03 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2012-05-05 17:41:45 -0500 |
| commit | 2d77ed68e7f0f200618da34f1bd51b82b3ab8955 (patch) | |
| tree | 2021129d5a3b4b9019fb22fc3c364c156d3d62eb /src/lib/Bcfg2/SSLServer.py | |
| parent | 07b5f654364ca236aa08b80df6d54c1b37bed4b6 (diff) | |
| download | bcfg2-2d77ed68e7f0f200618da34f1bd51b82b3ab8955.tar.gz bcfg2-2d77ed68e7f0f200618da34f1bd51b82b3ab8955.tar.bz2 bcfg2-2d77ed68e7f0f200618da34f1bd51b82b3ab8955.zip | |
PY3K: Get server code working again
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Bcfg2/SSLServer.py')
| -rw-r--r-- | src/lib/Bcfg2/SSLServer.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/SSLServer.py b/src/lib/Bcfg2/SSLServer.py index 418e259cc..6aa46ea58 100644 --- a/src/lib/Bcfg2/SSLServer.py +++ b/src/lib/Bcfg2/SSLServer.py @@ -14,7 +14,6 @@ import logging import ssl import threading import time -import types # Compatibility imports from Bcfg2.Bcfg2Py3k import xmlrpclib, SimpleXMLRPCServer, SocketServer @@ -46,7 +45,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, types.NoneType]: + if type(response) not in [bool, str, list, dict] or response is None: response = (response.decode('utf-8'), ) else: response = (response, ) |