Merge pull request #4121 from arnaud-morvan/processing_fix_modeler_op…

…en_file [processing] fix modeler and batch file dialog
qgis · Feb 9, 2017 · 71f1d28 · 71f1d28
2 parents 7ff894a + c43b04f
commit 71f1d28
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/python/plugins/processing/gui/BatchPanel.py b/python/plugins/processing/gui/BatchPanel.py
@@ -211,10 +211,10 @@ def save(self):
                     return
             toSave.append({self.PARAMETERS: algParams, self.OUTPUTS: algOutputs})
 
-        filename, __ = str(QFileDialog.getSaveFileName(self,
-                                                       self.tr('Save batch'),
-                                                       None,
-                                                       self.tr('JSON files (*.json)')))
+        filename, __ = QFileDialog.getSaveFileName(self,
+                                                   self.tr('Save batch'),
+                                                   None,
+                                                   self.tr('JSON files (*.json)'))
         if filename:
             if not filename.endswith('.json'):
                 filename += '.json'

diff --git a/python/plugins/processing/modeler/ModelerDialog.py b/python/plugins/processing/modeler/ModelerDialog.py
@@ -474,9 +474,10 @@ def saveModel(self, saveAs):
             self.hasChanged = False
 
     def openModel(self):
-        filename, selected_filter = str(QFileDialog.getOpenFileName(self,
-                                                                    self.tr('Open Model'), ModelerUtils.modelsFolders()[0],
-                                                                    self.tr('Processing models (*.model *.MODEL)')))
+        filename, selected_filter = QFileDialog.getOpenFileName(self,
+                                                                self.tr('Open Model'),
+                                                                ModelerUtils.modelsFolders()[0],
+                                                                self.tr('Processing models (*.model *.MODEL)'))
         if filename:
             try:
                 alg = ModelerAlgorithm.fromFile(filename)