diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2011-05-03 12:50:22 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2011-05-03 12:50:22 -0500 |
commit | 8bc620dd945a001754d01c87974a71ff078dc85a (patch) | |
tree | a509773b3fb996859b81e680ccc71ca6b4a5e7c6 | |
parent | 1229b74427843af749fe74edf446166dadd8cb85 (diff) | |
download | bcfg2-8bc620dd945a001754d01c87974a71ff078dc85a.tar.gz bcfg2-8bc620dd945a001754d01c87974a71ff078dc85a.tar.bz2 bcfg2-8bc620dd945a001754d01c87974a71ff078dc85a.zip |
Fix regressions with new py3k code
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
-rw-r--r-- | src/lib/Proxy.py | 2 | ||||
-rw-r--r-- | src/lib/Server/Core.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Proxy.py b/src/lib/Proxy.py index 30b7deaf5..8a1ad683e 100644 --- a/src/lib/Proxy.py +++ b/src/lib/Proxy.py @@ -88,7 +88,7 @@ class RetryMethod(xmlrpclib._Method): raise xmlrpclib.Fault(20, "Server Failure") # sorry jon -xmlrpclib._Method = RetryMethod +_Method = RetryMethod class SSLHTTPConnection(httplib.HTTPConnection): diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py index 4018c92ef..ac0a51e23 100644 --- a/src/lib/Server/Core.py +++ b/src/lib/Server/Core.py @@ -5,6 +5,7 @@ import atexit import logging import lxml.etree import select +import sys import threading import time |