x/vmware-nsx
Code Issues Proposed changes

Sync with commit-id: 9d529dd324d234d7aeaa3e6b4d3ab961f177e2ed

Browse Source 
(Pulling from the gate, neutron fail rates are currently too high
to have neutron jobs in the queue.)

Related-Bug: #1270212
Change-Id: I94965b395cfb34ed1576b84f21aa48edf991d629
This commit is contained in:
Salvatore Orlando 2014-01-17 08:48:44 -08:00 committed by Eugene Nikanorov
parent ba12cc88ce
commit 57b3b2997c
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
neutron/openstack/common/gettextutils.py
View File

@ -193,10 +193,11 @@ class Message(six.text_type):
# When we mod a Message we want the actual operation to be performed # When we mod a Message we want the actual operation to be performed
# by the parent class (i.e. unicode()), the only thing we do here is # by the parent class (i.e. unicode()), the only thing we do here is
# save the original msgid and the parameters in case of a translation # save the original msgid and the parameters in case of a translation
unicode_mod = super(Message, self).__mod__(other) params = self._sanitize_mod_params(other)
unicode_mod = super(Message, self).__mod__(params)
modded = Message(self.msgid, modded = Message(self.msgid,
msgtext=unicode_mod, msgtext=unicode_mod,
params=self._sanitize_mod_params(other), params=params,
domain=self.domain) domain=self.domain)
return modded return modded
@ -235,8 +236,17 @@ class Message(six.text_type):
params = self._copy_param(dict_param) params = self._copy_param(dict_param)
else: else:
params = {} params = {}
# Save our existing parameters as defaults to protect
# ourselves from losing values if we are called through an
# (erroneous) chain that builds a valid Message with
# arguments, and then does something like "msg % kwds"
# where kwds is an empty dictionary.
src = {}
if isinstance(self.params, dict):
src.update(self.params)
src.update(dict_param)
for key in keys: for key in keys:
params[key] = self._copy_param(dict_param[key]) params[key] = self._copy_param(src[key])
return params return params