Fix some processing breakage

qgis · Oct 30, 2016 · d5698be · d5698be
1 parent bd95061
commit d5698be
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/python/plugins/processing/gui/NumberInputPanel.py b/python/plugins/processing/gui/NumberInputPanel.py
@@ -103,7 +103,7 @@ def showExpressionsBuilder(self):
                     variables['%s_max' % name] = "Maximum value of %s" % desc
                     variables['%s_avg' % name] = "Mean value of %s" % desc
                     variables['%s_stddev' % name] = "Standard deviation of %s" % desc
-            for variable, desc in variables.iteritems():
+            for variable, desc in variables.items():
                 dlg.expressionBuilder().registerItem("Modeler", variable, "@" + variable, desc, highlightedItem=True)
         dlg.setWindowTitle(self.tr('Expression based input'))
         if dlg.exec_() == QDialog.Accepted:

diff --git a/python/plugins/processing/modeler/ModelerParameterDefinitionDialog.py b/python/plugins/processing/modeler/ModelerParameterDefinitionDialog.py
@@ -179,7 +179,7 @@ def setupUi(self):
             if self.param is not None:
                 self.minTextBox.setText(str(self.param.min))
                 self.maxTextBox.setText(str(self.param.max))
-            self.horizontalLayoutDefault.addWidget(QLabel(self.tr('Default value')))
+            self.verticalLayout.addWidget(QLabel(self.tr('Default value')))
             self.defaultTextBox = QLineEdit()
             self.defaultTextBox.setText(self.tr('0'))
             if self.param is not None:

diff --git a/python/plugins/processing/tools/dataobjects.py b/python/plugins/processing/tools/dataobjects.py
@@ -333,7 +333,7 @@ def exportVectorLayer(layer, supported=None):
     else:
         isASCII = True
         try:
-            str(layer.source()).decode('ascii')
+            str(layer.source())
         except UnicodeEncodeError:
             isASCII = False
         if not os.path.splitext(layer.source())[1].lower() in supported or not isASCII: