From fd9bedb7a907dece1b4114be782e6baa89182f42 Mon Sep 17 00:00:00 2001 From: Brian Elliott Date: Tue, 19 Apr 2016 18:33:03 +0000 Subject: [PATCH] xenapi: Fix xmlrpclib marshalling error 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 --- nova/virt/xenapi/client/session.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nova/virt/xenapi/client/session.py b/nova/virt/xenapi/client/session.py index 536588a05c..68aa8c1ac3 100644 --- a/nova/virt/xenapi/client/session.py +++ b/nova/virt/xenapi/client/session.py @@ -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()