diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2011-04-27 11:40:08 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2011-04-27 11:40:08 -0500 |
commit | d3348a34c78ba13d4d4c3e96db19faeeeefac11b (patch) | |
tree | 7b36955887357066bb5e5838f5f54f6ff2b518fc /src/lib/SSLServer.py | |
parent | 7f68ebb4ce4cb65850a63660f2f1cec06100064a (diff) | |
download | bcfg2-d3348a34c78ba13d4d4c3e96db19faeeeefac11b.tar.gz bcfg2-d3348a34c78ba13d4d4c3e96db19faeeeefac11b.tar.bz2 bcfg2-d3348a34c78ba13d4d4c3e96db19faeeeefac11b.zip |
Common: Add full PY3K compatibility
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/SSLServer.py')
-rw-r--r-- | src/lib/SSLServer.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/SSLServer.py b/src/lib/SSLServer.py index 2395bb84f..a89beabbb 100644 --- a/src/lib/SSLServer.py +++ b/src/lib/SSLServer.py @@ -8,10 +8,7 @@ __all__ = [ import os import sys -import xmlrpclib import socket -import SocketServer -import SimpleXMLRPCServer import base64 import select import signal @@ -19,6 +16,8 @@ import logging import ssl import threading import time +# Compatibility imports +from Bcfg2.Bcfg2Py3k import xmlrpclib, SimpleXMLRPCServer, SocketServer class ForkedChild(Exception): @@ -51,7 +50,8 @@ class XMLRPCDispatcher (SimpleXMLRPCServer.SimpleXMLRPCDispatcher): raw_response = xmlrpclib.dumps(response, methodresponse=1, allow_none=self.allow_none, encoding=self.encoding) - except xmlrpclib.Fault, fault: + except xmlrpclib.Fault: + fault = sys.exc_info()[1] raw_response = xmlrpclib.dumps(fault, allow_none=self.allow_none, encoding=self.encoding) @@ -258,7 +258,8 @@ class XMLRPCRequestHandler (SimpleXMLRPCServer.SimpleXMLRPCRequestHandler): # If we hit SSL3_WRITE_PENDING here try to resend. self.wfile.write(response) break - except ssl.SSLError, e: + except ssl.SSLError: + e = sys.exc_info()[1] if str(e).find("SSL3_WRITE_PENDING") < 0: raise self.logger.error("SSL3_WRITE_PENDING") |