use six.text_type

webapp/graphite/metrics/views.py

@@ -14,6 +14,7 @@
 
 from functools import reduce
 import pytz
+from six import text_type
 from six.moves.urllib.parse import unquote_plus
 
 from datetime import datetime
@@ -335,18 +336,13 @@ def msgpack_nodes(nodes):
   nodes_info = []
 
   # make sure everything is unicode in python 2.x and 3.x
-  try:
-    unicode = str
-  except:
-    pass
-
   for node in nodes:
     info = {
-      unicode('path'): unicode(node.path),
-      unicode('is_leaf'): node.is_leaf,
+      text_type('path'): text_type(node.path),
+      text_type('is_leaf'): node.is_leaf,
     }
     if node.is_leaf:
-      info[unicode('intervals')] = [interval.tuple for interval in node.intervals]
+      info[text_type('intervals')] = [interval.tuple for interval in node.intervals]
 
     nodes_info.append(info)
 

webapp/graphite/render/datalib.py

@@ -16,6 +16,7 @@
 import collections
 import re
 import time
+from six import text_type
 
 from django.conf import settings
 
@@ -121,21 +122,16 @@ def __repr__(self):
   def getInfo(self):
     """Pickle-friendly representation of the series"""
     # make sure everything is unicode in python 2.x and 3.x
-    try:
-      unicode = str
-    except:
-      pass
-
     return {
-      unicode('name') : unicode(self.name),
-      unicode('start') : self.start,
-      unicode('end') : self.end,
-      unicode('step') : self.step,
-      unicode('values') : list(self),
-      unicode('pathExpression') : unicode(self.pathExpression),
-      unicode('valuesPerPoint') : self.valuesPerPoint,
-      unicode('consolidationFunc'): unicode(self.consolidationFunc),
-      unicode('xFilesFactor') : self.xFilesFactor,
+      text_type('name') : text_type(self.name),
+      text_type('start') : self.start,
+      text_type('end') : self.end,
+      text_type('step') : self.step,
+      text_type('values') : list(self),
+      text_type('pathExpression') : text_type(self.pathExpression),
+      text_type('valuesPerPoint') : self.valuesPerPoint,
+      text_type('consolidationFunc'): text_type(self.consolidationFunc),
+      text_type('xFilesFactor') : self.xFilesFactor,
     }