Merge lp:~rconradharris/nova/bug706029 into lp:~hudson-openstack/nova/trunk

[Rick Harris]

Adds gettext to pluginlib_nova.py. Fixes #706029.

[Josh Kearney (jk0)]

lgtm

review: Approve

[Jay Pipes (jaypipes)]

Hmmm, typically gettext.install() is only called for endpoints (bin/* or runnable programs...).

Is pluginlib_nova.py an endpoint? If not, there may be a more appropriate place for this.

review: Needs Information

[Rick Harris (rconradharris)]

Hmm, pluginlib_nova.py is really an exceptional case in that it won't be run from within a bin/* runnable-program. Rather, it's called by a XenAPI dispatcher on the XenServer machine.

There might be a better place for it, but, I can't think of one off hand.

Alternatively, we could remove gettext entirely from pluginlib_nova, but, that doesn't seem ideal either.

[Jay Pipes (jaypipes)]

OK, that's a fair enough answer Rick. Makes sense to me.

review: Approve

=== modified file 'plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py'
--- plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py	2011-01-20 17:52:02 +0000
+++ plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py	2011-01-21 19:16:04 +0000
@@ -19,6 +19,8 @@
 # that we need.
 #
 
+import gettext
+gettext.install('nova', unicode=1)
 import httplib
 import logging
 import logging.handlers