allowing unicode error messages

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15051 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 15, 2011 · e8ffb0b · e8ffb0b
1 parent af87923
commit e8ffb0b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/python/plugins/GdalTools/GdalTools.py b/python/plugins/GdalTools/GdalTools.py
@@ -32,7 +32,7 @@
   from osgeo import gdal
   from osgeo import ogr
 except ImportError, e:
-  error_str = str(e)
+  error_str = e.args[0]
   error_mod = error_str.replace( "No module named ", "" )
   if req_mods.has_key( error_mod ):
     error_str = error_str.replace( error_mod, req_mods[error_mod] )

diff --git a/python/plugins/GdalTools/tools/GdalTools_utils.py b/python/plugins/GdalTools/tools/GdalTools_utils.py
@@ -181,10 +181,15 @@ def fillVectorOutputFormat(aFilter = None, filename = None):
 
   return shortName
 
+class UnsupportedOGRFormat(Exception):
+    def __init__(self): 
+      msg = QCoreApplication.translate( "GdalTools", "The selected file is not a supported OGR format" )
+      Exception.__init__(self, msg) 
+
 def getVectorFields(vectorFile):
     hds = ogr.Open( unicode(vectorFile).encode('utf8') )
     if hds == None:
-      raise Exception( QCoreApplication.translate( "GdalTools", "The selected file is not a supported OGR format" ) )
+      raise UnsupportedOGRFormat()
 
     fields = []
     names = []

diff --git a/python/plugins/GdalTools/tools/doGrid.py b/python/plugins/GdalTools/tools/doGrid.py
@@ -183,8 +183,8 @@ def loadFields(self, vectorFile = QString()):
 
       try:
         (fields, names) = Utils.getVectorFields(vectorFile)
-      except Exception, e:
-        QErrorMessage(self).showMessage( str(e) )
+      except Utils.UnsupportedOGRFormat, e:
+        QErrorMessage(self).showMessage( e.args[0] )
 
         self.inputLayerCombo.clearEditText()
         self.inputLayerCombo.setCurrentIndex(-1)

diff --git a/python/plugins/GdalTools/tools/doRasterize.py b/python/plugins/GdalTools/tools/doRasterize.py
@@ -104,8 +104,8 @@ def loadFields(self, vectorFile):
 
       try:
         (fields, names) = Utils.getVectorFields(vectorFile)
-      except Exception, e:
-        QErrorMessage(self).showMessage( str(e) )
+      except Utils.UnsupportedOGRFormat, e:
+        QErrorMessage(self).showMessage( e.args[0] )
 
         self.inputLayerCombo.clearEditText()
         self.inputLayerCombo.setCurrentIndex(-1)