allow utf8 in metadata.txt

qgis · Jun 9, 2013 · 8609a41 · 8609a41
1 parent 95dcd96
commit 8609a41
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/python/pyplugin_installer/installer_data.py b/python/pyplugin_installer/installer_data.py
@@ -28,6 +28,7 @@
 from PyQt4.QtNetwork import *
 import sys
 import os
+import codecs
 import ConfigParser
 import qgis.utils
 from qgis.core import *
@@ -556,12 +557,10 @@ def pluginMetadata(fct):
         if not os.path.exists(metadataFile):
           return "" # plugin has no metadata.txt file
         cp = ConfigParser.ConfigParser()
-        res = cp.read(metadataFile)
-        if not len(res):
-          return "" # failed reading metadata.txt file
         try:
+          cp.readfp(codecs.open(metadataFile, "r", "utf8"))
           return cp.get('general', fct)
-        except Exception:
+        except:
           return ""
 
     if readOnly:

diff --git a/python/utils.py b/python/utils.py
@@ -38,6 +38,7 @@
 import re
 import ConfigParser
 import warnings
+import codecs
 
 #######################
 # ERROR HANDLING
@@ -129,8 +130,10 @@ def findPlugins(path):
       continue
 
     cp = ConfigParser.ConfigParser()
-    res = cp.read(metadataFile)
-    if len(res) == 0:
+
+    try:
+      cp.readfp(codecs.open(metadataFile, "r", "utf8"))
+    except:
       return None # reading of metadata file failed
 
     pluginName = os.path.basename(plugin)