From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59604) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ueoa6-00026k-Ly for qemu-devel@nongnu.org; Tue, 21 May 2013 11:34:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UeoZu-0002QK-0z for qemu-devel@nongnu.org; Tue, 21 May 2013 11:34:30 -0400 Received: from usindpps06.hds.com ([207.126.252.19]:52233) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UeoZt-0002Q4-Rh for qemu-devel@nongnu.org; Tue, 21 May 2013 11:34:17 -0400 From: Tomoki Sekiyama Date: Tue, 21 May 2013 11:34:16 -0400 Message-ID: <20130521153415.4880.53934.stgit@hds.com> In-Reply-To: <20130521153333.4880.74390.stgit@hds.com> References: <20130521153333.4880.74390.stgit@hds.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [RFC PATCH v3 11/11] QMP/qmp.py: set locale for exceptions to display non-ascii messages correctly List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, lcapitulino@redhat.com, vrozenfe@redhat.com, pbonzini@redhat.com, seiji.aguchi@hds.com, areis@redhat.com qemu-ga in Windows may return error message with multibyte characters when the guest OS language is set to other than English. To display such messages correctly, this encodes the message based on the locale settings. Signed-off-by: Tomoki Sekiyama --- QMP/qmp.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/QMP/qmp.py b/QMP/qmp.py index c551df1..ee21819 100644 --- a/QMP/qmp.py +++ b/QMP/qmp.py @@ -11,6 +11,7 @@ import json import errno import socket +import locale class QMPError(Exception): pass @@ -133,7 +134,8 @@ class QEMUMonitorProtocol: def command(self, cmd, **kwds): ret = self.cmd(cmd, kwds) if ret.has_key('error'): - raise Exception(ret['error']['desc']) + enc = locale.getpreferredencoding() + raise Exception(ret['error']['desc'].encode(enc)) return ret['return'] def pull_event(self, wait=False):