openstack/nova
Code Issues Proposed changes

xenapi: Fix xmlrpclib marshalling error

Browse Source 
Fix an error that occurs when trying to marshal an
oslo_i18n._message.Message object via xmlrpclib.

xmlrpclib is not designed to marshal custom objects.  Since
nova_version is only used for this one purpose, don't internationalize
it.

Closes-Bug: 1572264

Change-Id: I04c59993125834fc50abd0c5b6dc3fd0269b7243
This commit is contained in:
Brian Elliott
2016-04-19 18:33:03 +00:00
parent 16cea9cdc5
commit fd9bedb7a9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nova/virt/xenapi/client/session.py
View File

@@ -75,10 +75,10 @@ class XenAPISession(object):
def __init__(self, url, user, pw):
version_string = version.version_string_with_package()
self.nova_version = _('%(vendor)s %(product)s %(version)s') % \
{'vendor': version.vendor_string(),
'product': version.product_string(),
'version': version_string}
self.nova_version = ('%(vendor)s %(product)s %(version)s' %
{'vendor': version.vendor_string(),
'product': version.product_string(),
'version': version_string})
import XenAPI
self.XenAPI = XenAPI
self._sessions = queue.Queue()