diff options
| author | Joshua Lock <josh@linux.intel.com> | 2011-03-05 17:01:14 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-14 20:48:37 +0000 |
| commit | 7da9f27c376bbe54baef564b32c165a2a6e860f9 (patch) | |
| tree | f65f5f80b9a7b46dcb716d0ffa46af44543e5bb3 /bitbake/lib | |
| parent | e58b3a480411515e9cb1d15adf4b7fa471ed4374 (diff) | |
| download | ast2050-yocto-poky-7da9f27c376bbe54baef564b32c165a2a6e860f9.zip ast2050-yocto-poky-7da9f27c376bbe54baef564b32c165a2a6e860f9.tar.gz | |
bitbake/xmlrpc: only use BBTransport for affected Python versions
Upstream have fixed the xmlrpclip.Transport() bug from Python #8194 for
the Python 2.7.2 release, therefore as we know which versions of the
standard library are affected we can only use our copy/paste class when
it's needed.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'bitbake/lib')
| -rw-r--r-- | bitbake/lib/bb/server/xmlrpc.py | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/bitbake/lib/bb/server/xmlrpc.py b/bitbake/lib/bb/server/xmlrpc.py index 0d03e30..e7b6010 100644 --- a/bitbake/lib/bb/server/xmlrpc.py +++ b/bitbake/lib/bb/server/xmlrpc.py @@ -52,6 +52,8 @@ if sys.hexversion < 0x020600F0: # implementations from Python 2.6.6's xmlrpclib. # # Upstream Python bug is #8194 (http://bugs.python.org/issue8194) +# This bug is relevant for Python 2.7.0 and 2.7.1 but was fixed for +# Python > 2.7.2 ## class BBTransport(xmlrpclib.Transport): @@ -107,6 +109,18 @@ class BBTransport(xmlrpclib.Transport): return u.close() +def _create_server(host, port): + # Python 2.7.0 and 2.7.1 have a buggy Transport implementation + # For those versions of Python, and only those versions, use our + # own copy/paste BBTransport class. + if (2, 7, 0) <= sys.version_info < (2, 7, 2): + t = BBTransport() + s = xmlrpclib.Server("http://%s:%d/" % (host, port), transport=t, allow_none=True) + else: + s = xmlrpclib.Server("http://%s:%d/" % (host, port), allow_none=True) + + return s + class BitBakeServerCommands(): def __init__(self, server, cooker): self.cooker = cooker @@ -116,8 +130,8 @@ class BitBakeServerCommands(): """ Register a remote UI Event Handler """ - t = BBTransport() - s = xmlrpclib.Server("http://%s:%d/" % (host, port), transport=t, allow_none=True) + s = _create_server(host, port) + return bb.event.register_UIHhandler(s) def unregisterEventHandler(self, handlerNum): @@ -240,8 +254,7 @@ class BitbakeUILauch(): class BitBakeServerConnection(): def __init__(self, serverinfo): - t = BBTransport() - self.connection = xmlrpclib.Server("http://%s:%s" % (serverinfo.host, serverinfo.port), transport=t, allow_none=True) + self.connection = _create_server(serverinfo.host, serverinfo.port) self.events = uievent.BBUIEventQueue(self.connection) for event in bb.event.ui_queue: self.events.queue_event(event) |
