From: Paul Brossier <piem@piem.org>
Date: Tue, 16 Apr 2013 00:02:37 +0000 (-0500)
Subject: timeside/analyzer/core.py: fix u'' in xml
X-Git-Tag: 0.5.0~115^2~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=635ecb6839adeb13307d1391959fb74acab08a6c;p=timeside.git

timeside/analyzer/core.py: fix u'' in xml
---

diff --git a/timeside/analyzer/core.py b/timeside/analyzer/core.py
index 7357c32..13479a4 100644
--- a/timeside/analyzer/core.py
+++ b/timeside/analyzer/core.py
@@ -103,7 +103,10 @@ class AnalyzerResultContainer(object):
             node = doc.createElement('data')
             for a in ['name', 'id', 'unit']:
                 node.setAttribute(a, str(data[a]) )
-            node.setAttribute('value', repr(data['value']) )
+            if type(data['value']) in [str, unicode]:
+                node.setAttribute('value', data['value'] )
+            else:
+                node.setAttribute('value', repr(data['value']) )
             root.appendChild(node)
         return xml.dom.minidom.Document.toprettyxml(doc)
 
@@ -118,7 +121,10 @@ class AnalyzerResultContainer(object):
             child_dict = {}
             for a in ['name', 'id', 'unit']:
                 child_dict[a] = str(child.getAttribute(a))
-            child_dict['value'] = ast.literal_eval(child.getAttribute('value'))
+            try:
+                child_dict['value'] = ast.literal_eval(child.getAttribute('value'))
+            except:
+                child_dict['value'] = child.getAttribute('value')
             results.append(child_dict)
         return results