From 4053efae85cfb872068ab81edbe7df49e0c41ae4 Mon Sep 17 00:00:00 2001 From: Michael Young Date: Thu, 19 Aug 2010 17:09:30 +0100 Subject: [PATCH] tools/python: fix xm list for Python 2.7 This patch fixes Unexpected error: This is due to xmlrpc changes in Python 2.7. This patch should fixe it for both old and new versions. Signed-off-by: Michael Young Signed-off-by: Ian Jackson --- tools/python/xen/util/xmlrpcclient.py | 8 +++++++- tools/python/xen/util/xmlrpclib2.py | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/python/xen/util/xmlrpcclient.py b/tools/python/xen/util/xmlrpcclient.py index 5b8831713c..d4191b7489 100644 --- a/tools/python/xen/util/xmlrpcclient.py +++ b/tools/python/xen/util/xmlrpcclient.py @@ -22,6 +22,7 @@ import socket import string import xmlrpclib from types import StringTypes +from sys import hexversion try: @@ -54,7 +55,12 @@ class UnixTransport(xmlrpclib.Transport): return xmlrpclib.Transport.request(self, host, '/RPC2', request_body, verbose) def make_connection(self, host): - return HTTPUnix(self.__handler) + if hexversion < 0x02070000: + # python 2.6 or earlier + return HTTPUnix(self.__handler) + else: + # xmlrpclib.Transport changed in python 2.7 + return HTTPUnixConnection(self.__handler) # We need our own transport for HTTPS, because xmlrpclib.SafeTransport is diff --git a/tools/python/xen/util/xmlrpclib2.py b/tools/python/xen/util/xmlrpclib2.py index a503de1241..065a0a3e96 100644 --- a/tools/python/xen/util/xmlrpclib2.py +++ b/tools/python/xen/util/xmlrpclib2.py @@ -58,6 +58,9 @@ def stringify(value): # some bugs in Keep-Alive handling and also enabled it by default class XMLRPCRequestHandler(SimpleXMLRPCRequestHandler): protocol_version = "HTTP/1.1" + # xend crashes in python 2.7 unless disable_nagle_algorithm = False + # it isn't used in earlier versions so it is harmless to set it generally + disable_nagle_algorithm = False def __init__(self, hosts_allowed, request, client_address, server): self.hosts_allowed = hosts_allowed -- 2.30.2