From 3a0a8969e93d5e3fdd976d3f250e91ea404268c9 Mon Sep 17 00:00:00 2001 From: Florent Date: Fri, 1 Mar 2013 22:49:24 +0100 Subject: [PATCH] Fix encoding of title and vlabel --- contrib/munin/generic/README | 3 +++ contrib/munin/generic/generic-munin | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/contrib/munin/generic/README b/contrib/munin/generic/README index 86af4c6c..6fe154aa 100644 --- a/contrib/munin/generic/README +++ b/contrib/munin/generic/README @@ -131,6 +131,8 @@ env.label name # Temperature in Rennes +[temprennes] +user florent env.cache_expire 7200 env.HOME /home/flo env.capa ICapWeather @@ -140,3 +142,4 @@ env.attribvalue temp/value env.attribid temp/id env.title Température à Rennes env.vlabel Température +env.label id diff --git a/contrib/munin/generic/generic-munin b/contrib/munin/generic/generic-munin index 1b8391f7..b730ea61 100755 --- a/contrib/munin/generic/generic-munin +++ b/contrib/munin/generic/generic-munin @@ -58,13 +58,13 @@ class GenericMuninPlugin(object): self.attribvalue = os.environ['attribvalue'] self.title = '' if 'title' in os.environ: - self.title = os.environ['title'] + self.title = os.environ['title'].decode('utf-8') self.attriblabel = "label" if 'label' in os.environ: self.attriblabel = os.environ['label'] self.vlabel = self.attribvalue if 'vlabel' in os.environ: - self.vlabel = os.environ['vlabel'] + self.vlabel = os.environ['vlabel'].decode('utf-8') def display_help(self): @@ -176,8 +176,8 @@ class GenericMuninPlugin(object): self.new_cache('%s-config' % self.name) self.weboob.load_backends(self.capa) - self.write_output('graph_title %s' % self.title) - self.write_output('graph_vlabel %s' % self.vlabel) + self.write_output('graph_title %s' % self.title.encode('iso-8859-15')) + self.write_output('graph_vlabel %s' % self.vlabel.encode('iso-8859-15')) self.write_output('graph_category weboob') self.write_output('graph_args -l 0') try: