Correction Rsvg.Handle(data=data)

1 files changed, 11 insertions, 7 deletions

diff --git a/utils.py b/utils.py
index 1d3f2c3..68b03ee 100644
--- a/utils.py
+++ b/utils.py
@@ -10,25 +10,27 @@ from gi.repository import GdkPixbuf
 from gi.repository import Rsvg
 
 def getStringFromPixbuf(pixbuf):
+    
     data = [""]
     pixbuf.save_to_callback(_saveDataToBufferCb, "png", {}, data)
     return base64.b64encode(str(data[0]))
 
-
 def _saveDataToBufferCb(buf, data):
+    
     data[0] += buf
     return True
 
-
 def getPixbufFromString(str):
+    
     pbl = GdkPixbuf.PixbufLoader()
     data = base64.b64decode( str )
     pbl.write(data)
     pbl.close()
+    
     return pbl.get_pixbuf()
 
-
 def load_colored_svg(filename, stroke, fill):
+    
     path = os.path.join(constants.GFX_PATH, filename)
     data = open(path, 'r').read()
 
@@ -38,22 +40,24 @@ def load_colored_svg(filename, stroke, fill):
     entity = '<!ENTITY stroke_color "%s">' % stroke
     data = re.sub('<!ENTITY stroke_color .*>', entity, data)
 
-    #return Rsvg.Handle(data=data).get_pixbuf()
-    # FIXME: TypeError: Item 0: Must be number or single byte string, not unicode
-    #Rsvg.Handle.new_from_data(data).get_pixbuf()
+    Rsvg.Handle.new_from_data(name.encode('ascii', data)).get_pixbuf()
 
 def getUniqueFilepath( path, i ):
+    
     pathOb = os.path.abspath( path )
     newPath = os.path.join( os.path.dirname(pathOb), str( str(i) + os.path.basename(pathOb) ) )
+    
     if (os.path.exists(newPath)):
         i = i + 1
         return getUniqueFilepath( pathOb, i )
+    
     else:
         return os.path.abspath( newPath )
 
 def generate_thumbnail(pixbuf):
+    
     return pixbuf.scale_simple(108, 81, GdkPixbuf.InterpType.BILINEAR)
 
 def getDateString( when ):
+    
     return strftime( "%c", time.localtime(when) )
-