packages: xen/xen-python27.patch (NEW) - fix for python27

marcus marcus at pld-linux.org
Sat Jan 22 08:29:05 CET 2011


Author: marcus                       Date: Sat Jan 22 07:29:05 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix for python27

---- Files affected:
packages/xen:
   xen-python27.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xen/xen-python27.patch
diff -u /dev/null packages/xen/xen-python27.patch:1.1
--- /dev/null	Sat Jan 22 08:29:05 2011
+++ packages/xen/xen-python27.patch	Sat Jan 22 08:29:00 2011
@@ -0,0 +1,36 @@
+--- xen-4.0.1/tools/python/xen/util/xmlrpcclient.py.orig	2010-02-02 20:43:01.000000000 +0000
++++ xen-4.0.1/tools/python/xen/util/xmlrpcclient.py	2010-08-18 21:36:05.000000000 +0100
+@@ -22,6 +22,7 @@
+ import string
+ import xmlrpclib
+ from types import StringTypes
++from sys import hexversion
+ 
+ 
+ try:
+@@ -54,7 +55,12 @@
+         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
+--- xen-4.0.1/tools/python/xen/util/xmlrpclib2.py.orig	2010-02-02 20:43:01.000000000 +0000
++++ xen-4.0.1/tools/python/xen/util/xmlrpclib2.py	2010-08-18 21:35:40.000000000 +0100
+@@ -58,6 +58,9 @@
+ # 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
================================================================


More information about the pld-cvs-commit mailing list