fixed #6759 and #6228

qgis · Nov 30, 2012 · 9cb4602 · 9cb4602
1 parent b35aedc
commit 9cb4602
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/python/plugins/sextante/admintools/geoserver/store.py b/python/plugins/sextante/admintools/geoserver/store.py
@@ -1,7 +1,7 @@
-import sextante.admintools.geoserver.workspace as ws
 from sextante.admintools.geoserver.resource import featuretype_from_index, coverage_from_index
 from sextante.admintools.geoserver.support import ResourceInfo, xml_property, key_value_pairs, \
         write_bool, write_dict, write_string, url
+from sextante.admintools.geoserver.workspace import Workspace
 
 def datastore_from_index(catalog, workspace, node):
     name = node.find("name")
@@ -18,7 +18,7 @@ class DataStore(ResourceInfo):
     def __init__(self, catalog, workspace, name):
         super(DataStore, self).__init__()
 
-        assert isinstance(workspace, ws.Workspace)
+        assert isinstance(workspace, Workspace)
         assert isinstance(name, basestring)
         self.catalog = catalog
         self.workspace = workspace
@@ -69,7 +69,7 @@ class CoverageStore(ResourceInfo):
     def __init__(self, catalog, workspace, name):
         super(CoverageStore, self).__init__()
 
-        assert isinstance(workspace, ws.Workspace)
+        assert isinstance(workspace, Workspace)
         assert isinstance(name, basestring)
 
         self.catalog = catalog

diff --git a/python/plugins/sextante/gui/OutputSelectionPanel.py b/python/plugins/sextante/gui/OutputSelectionPanel.py
@@ -90,9 +90,10 @@ def saveToFile(self):
         fileDialog.setConfirmOverwrite(True)
         if fileDialog.exec_() == QDialog.Accepted:
             filename = fileDialog.selectedFiles().first()
-            encoding = fileDialog.encoding()
+            encoding = fileDialog.encoding()            
             self.output.encoding = encoding
-            self.text.setText(str(filename))
+            filename= unicode(filename);            
+            self.text.setText(filename)
             settings.setValue("/SextanteQGIS/LastOutputPath", os.path.dirname(str(filename)))
             settings.setValue("/SextanteQGIS/encoding", encoding)