From cbe8cb7282adab4b3ffc7ff41b36c6019bcafbc8 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Sat, 30 Jan 2016 09:33:24 +1100 Subject: [PATCH] Formatting update, using newer autopep8 version --- python/console/console_sci.py | 2 +- python/custom_widgets/qgis_customwidgets.py | 10 ++--- python/plugins/MetaSearch/plugin.py | 8 ++-- .../db_plugins/oracle/info_model.py | 2 +- python/plugins/fTools/tools/doEliminate.py | 28 +++++++------- python/plugins/fTools/tools/doValidate.py | 2 +- .../processing/algs/gdal/ClipByMask.py | 2 +- .../plugins/processing/algs/gdal/ogrinfo.py | 2 +- python/plugins/processing/algs/gdal/ogrsql.py | 2 +- .../plugins/processing/algs/grass7/nviz7.py | 2 +- .../algs/lidar/LidarToolsAlgorithmProvider.py | 2 +- .../processing/algs/qgis/AddTableField.py | 2 +- .../processing/algs/qgis/ExtentFromLayer.py | 4 +- .../processing/algs/qgis/FieldPyculator.py | 2 +- .../processing/algs/qgis/PointDistance.py | 4 +- .../processing/algs/qgis/Polygonize.py | 2 +- .../algs/qgis/SinglePartsToMultiparts.py | 2 +- .../processing/algs/qgis/UniqueValues.py | 2 +- .../processing/algs/qgis/VoronoiPolygons.py | 14 +++---- .../processing/algs/qgis/postgis_utils.py | 2 +- .../algs/qgis/scripts/Fill_holes.py | 26 ++++++------- .../algs/qgis/scripts/Keep_n_biggest_parts.py | 38 +++++++++---------- .../plugins/processing/algs/r/RAlgorithm.py | 2 +- .../processing/algs/saga/SagaAlgorithm213.py | 2 +- .../processing/core/ProcessingConfig.py | 4 +- .../processing/gui/NumberInputDialog.py | 14 +++---- python/plugins/processing/gui/ScriptEdit.py | 2 +- .../processing/gui/ScriptEditorDialog.py | 4 +- .../modeler/CalculatorModelerAlgorithm.py | 2 +- .../processing/modeler/ModelerArrowItem.py | 2 +- .../processing/modeler/ModelerGraphicItem.py | 16 ++++---- .../modeler/RasterLayerBoundsAlgorithm.py | 6 +-- .../modeler/VectorLayerBoundsAlgorithm.py | 6 +-- .../script/ScriptAlgorithmProvider.py | 12 +++--- .../processing/tests/qgis_interface.py | 6 +-- python/plugins/processing/tests/test.py | 2 +- python/plugins/processing/tools/vector.py | 4 +- python/pyplugin_installer/installer_data.py | 2 +- src/plugins/grass/scripts/r.external.all.py | 8 ++-- 39 files changed, 127 insertions(+), 127 deletions(-) diff --git a/python/console/console_sci.py b/python/console/console_sci.py index dad94f4837c..0cdf478fc48 100644 --- a/python/console/console_sci.py +++ b/python/console/console_sci.py @@ -449,7 +449,7 @@ class ShellScintilla(QsciScintilla, code.InteractiveInterpreter): return elif t == '(' and (re.match(r'^[ \t]*def \w+$', txt) or re.match(r'^[ \t]*class \w+$', txt)): - self.insert('):') + self.insert('):') else: self.insert(self.closing[i]) ## FIXES #8392 (automatically removes the redundant char diff --git a/python/custom_widgets/qgis_customwidgets.py b/python/custom_widgets/qgis_customwidgets.py index a897de723ad..0a8b6d108dc 100644 --- a/python/custom_widgets/qgis_customwidgets.py +++ b/python/custom_widgets/qgis_customwidgets.py @@ -48,8 +48,8 @@ pluginType = MODULE def moduleInformation(): - try: - import qgis.gui - return "qgis.gui", dir(qgis.gui) - except ImportError: - return "", [] + try: + import qgis.gui + return "qgis.gui", dir(qgis.gui) + except ImportError: + return "", [] diff --git a/python/plugins/MetaSearch/plugin.py b/python/plugins/MetaSearch/plugin.py index 6234c0e62c5..b0ea3ae680d 100644 --- a/python/plugins/MetaSearch/plugin.py +++ b/python/plugins/MetaSearch/plugin.py @@ -57,9 +57,9 @@ class MetaSearchPlugin(object): self.action_run = QAction(run_icon, 'MetaSearch', self.iface.mainWindow()) self.action_run.setWhatsThis(QCoreApplication.translate('MetaSearch', - 'MetaSearch plugin')) + 'MetaSearch plugin')) self.action_run.setStatusTip(QCoreApplication.translate('MetaSearch', - 'Search Metadata Catalogues')) + 'Search Metadata Catalogues')) self.action_run.triggered.connect(self.run) @@ -70,9 +70,9 @@ class MetaSearchPlugin(object): help_icon = QIcon('%s/%s' % (self.context.ppath, 'images/help.png')) self.action_help = QAction(help_icon, 'Help', self.iface.mainWindow()) self.action_help.setWhatsThis(QCoreApplication.translate('MetaSearch', - 'MetaSearch plugin help')) + 'MetaSearch plugin help')) self.action_help.setStatusTip(QCoreApplication.translate('MetaSearch', - 'Get Help on MetaSearch')) + 'Get Help on MetaSearch')) self.action_help.triggered.connect(self.help) self.iface.addPluginToWebMenu(self.web_menu, self.action_help) diff --git a/python/plugins/db_manager/db_plugins/oracle/info_model.py b/python/plugins/db_manager/db_plugins/oracle/info_model.py index 70063e0cca1..e65691f0eb5 100644 --- a/python/plugins/db_manager/db_plugins/oracle/info_model.py +++ b/python/plugins/db_manager/db_plugins/oracle/info_model.py @@ -50,7 +50,7 @@ class ORDatabaseInfo(DatabaseInfo): tbl.append((QApplication.translate("DBManagerPlugin", "Host:"), self.db.connector.host)) tbl.append((QApplication.translate("DBManagerPlugin", "Database:"), - self.db.connector.dbname)) + self.db.connector.dbname)) tbl.append((QApplication.translate("DBManagerPlugin", "User:"), self.db.connector.user)) tbl.append((QApplication.translate("DBManagerPlugin", diff --git a/python/plugins/fTools/tools/doEliminate.py b/python/plugins/fTools/tools/doEliminate.py index 951f6a293f4..2268be084c9 100644 --- a/python/plugins/fTools/tools/doEliminate.py +++ b/python/plugins/fTools/tools/doEliminate.py @@ -174,24 +174,24 @@ class Dialog(QDialog, Ui_Dialog): selFeat = QgsFeature() while fit.nextFeature(selFeat): - selGeom = selFeat.geometry() + selGeom = selFeat.geometry() - if geom2Eliminate.intersects(selGeom): # we have a candidate - iGeom = geom2Eliminate.intersection(selGeom) + if geom2Eliminate.intersects(selGeom): # we have a candidate + iGeom = geom2Eliminate.intersection(selGeom) - if boundary: - selValue = iGeom.length() + if boundary: + selValue = iGeom.length() + else: + # we need a common boundary + if 0 < iGeom.length(): + selValue = selGeom.area() else: - # we need a common boundary - if 0 < iGeom.length(): - selValue = selGeom.area() - else: - selValue = 0 + selValue = 0 - if selValue > max: - max = selValue - mergeWithFid = selFeat.id() - mergeWithGeom = QgsGeometry(selGeom) # deep copy of the geometry + if selValue > max: + max = selValue + mergeWithFid = selFeat.id() + mergeWithGeom = QgsGeometry(selGeom) # deep copy of the geometry if mergeWithFid is not None: # a successful candidate newGeom = mergeWithGeom.combine(geom2Eliminate) diff --git a/python/plugins/fTools/tools/doValidate.py b/python/plugins/fTools/tools/doValidate.py index 0bdbc8f9f23..000e95b99c1 100644 --- a/python/plugins/fTools/tools/doValidate.py +++ b/python/plugins/fTools/tools/doValidate.py @@ -112,7 +112,7 @@ class ValidateDialog(QDialog, Ui_Dialog): def keyPressEvent(self, e): if (e.modifiers() == Qt.ControlModifier or - e.modifiers() == Qt.MetaModifier ) and \ + e.modifiers() == Qt.MetaModifier ) and \ e.key() == Qt.Key_C: items = "" for row in range(self.tblUnique.rowCount()): diff --git a/python/plugins/processing/algs/gdal/ClipByMask.py b/python/plugins/processing/algs/gdal/ClipByMask.py index 285f06a4364..6a371912818 100644 --- a/python/plugins/processing/algs/gdal/ClipByMask.py +++ b/python/plugins/processing/algs/gdal/ClipByMask.py @@ -70,7 +70,7 @@ class ClipByMask(GdalAlgorithm): self.group, self.i18n_group = self.trAlgorithm('[GDAL] Extraction') self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer'), False)) self.addParameter(ParameterVector(self.MASK, self.tr('Mask layer'), - [ParameterVector.VECTOR_TYPE_POLYGON])) + [ParameterVector.VECTOR_TYPE_POLYGON])) self.addParameter(ParameterString(self.NO_DATA, self.tr("Nodata value, leave blank to take the nodata value from input"), '-9999')) diff --git a/python/plugins/processing/algs/gdal/ogrinfo.py b/python/plugins/processing/algs/gdal/ogrinfo.py index 102fc9cd980..59c2f142e96 100644 --- a/python/plugins/processing/algs/gdal/ogrinfo.py +++ b/python/plugins/processing/algs/gdal/ogrinfo.py @@ -48,7 +48,7 @@ class OgrInfo(GdalAlgorithm): self.group, self.i18n_group = self.trAlgorithm('[OGR] Miscellaneous') self.addParameter(ParameterVector(self.INPUT, self.tr('Input layer'), - [ParameterVector.VECTOR_TYPE_ANY], False)) + [ParameterVector.VECTOR_TYPE_ANY], False)) self.addParameter(ParameterBoolean(self.SUMMARY_ONLY, self.tr('Summary output only'), True)) diff --git a/python/plugins/processing/algs/gdal/ogrsql.py b/python/plugins/processing/algs/gdal/ogrsql.py index d699f30fd8b..155f96c27ac 100644 --- a/python/plugins/processing/algs/gdal/ogrsql.py +++ b/python/plugins/processing/algs/gdal/ogrsql.py @@ -52,7 +52,7 @@ class OgrSql(GdalAlgorithm): self.group, self.i18n_group = self.trAlgorithm('[OGR] Miscellaneous') self.addParameter(ParameterVector(self.INPUT, self.tr('Input layer'), - [ParameterVector.VECTOR_TYPE_ANY], False)) + [ParameterVector.VECTOR_TYPE_ANY], False)) self.addParameter(ParameterString(self.SQL, self.tr('SQL'), '')) self.addParameter(ParameterSelection( diff --git a/python/plugins/processing/algs/grass7/nviz7.py b/python/plugins/processing/algs/grass7/nviz7.py index 018440ff9ef..3f22668715b 100644 --- a/python/plugins/processing/algs/grass7/nviz7.py +++ b/python/plugins/processing/algs/grass7/nviz7.py @@ -165,7 +165,7 @@ class nviz7(GeoAlgorithm): else: layer = dataobjects.getObjectFromUri(param.value) cellsize = max(cellsize, (layer.extent().xMaximum() - - layer.extent().xMinimum()) + - layer.extent().xMinimum()) / layer.width()) elif isinstance(param, ParameterMultipleInput): diff --git a/python/plugins/processing/algs/lidar/LidarToolsAlgorithmProvider.py b/python/plugins/processing/algs/lidar/LidarToolsAlgorithmProvider.py index b856af0dff9..d5c6c5c7bab 100644 --- a/python/plugins/processing/algs/lidar/LidarToolsAlgorithmProvider.py +++ b/python/plugins/processing/algs/lidar/LidarToolsAlgorithmProvider.py @@ -200,7 +200,7 @@ class LidarToolsAlgorithmProvider(AlgorithmProvider): Catalog(), CloudMetrics(), CanopyMaxima(), CanopyModel(), ClipData(), Csv2Grid(), Cover(), FilterData(), GridMetrics(), GroundFilter(), GridSurfaceCreate(), MergeData(), TinSurfaceCreate(), PolyClipData(), - DTM2TIF(), FirstLastReturn(), ASCII2DTM() + DTM2TIF(), FirstLastReturn(), ASCII2DTM() ] for alg in fusiontools: alg.group, alg.i18n_group = alg.trAlgorithm('Fusion') diff --git a/python/plugins/processing/algs/qgis/AddTableField.py b/python/plugins/processing/algs/qgis/AddTableField.py index 190b9134bbc..e3c40666e0f 100644 --- a/python/plugins/processing/algs/qgis/AddTableField.py +++ b/python/plugins/processing/algs/qgis/AddTableField.py @@ -81,7 +81,7 @@ class AddTableField(GeoAlgorithm): provider = layer.dataProvider() fields = provider.fields() fields.append(QgsField(fieldName, self.TYPES[fieldType], '', - fieldLength, fieldPrecision)) + fieldLength, fieldPrecision)) writer = output.getVectorWriter(fields, provider.geometryType(), layer.crs()) outFeat = QgsFeature() diff --git a/python/plugins/processing/algs/qgis/ExtentFromLayer.py b/python/plugins/processing/algs/qgis/ExtentFromLayer.py index 2c2ca9c9d46..257b25afe08 100644 --- a/python/plugins/processing/algs/qgis/ExtentFromLayer.py +++ b/python/plugins/processing/algs/qgis/ExtentFromLayer.py @@ -94,7 +94,7 @@ class ExtentFromLayer(GeoAlgorithm): perim = 2 * width + 2 * height rect = [QgsPoint(minx, miny), QgsPoint(minx, maxy), QgsPoint(maxx, - maxy), QgsPoint(maxx, miny), QgsPoint(minx, miny)] + maxy), QgsPoint(maxx, miny), QgsPoint(minx, miny)] geometry = QgsGeometry().fromPolygon([rect]) feat = QgsFeature() feat.setGeometry(geometry) @@ -131,7 +131,7 @@ class ExtentFromLayer(GeoAlgorithm): area = width * height perim = 2 * width + 2 * height rect = [QgsPoint(minx, miny), QgsPoint(minx, maxy), QgsPoint(maxx, - maxy), QgsPoint(maxx, miny), QgsPoint(minx, miny)] + maxy), QgsPoint(maxx, miny), QgsPoint(minx, miny)] geometry = QgsGeometry().fromPolygon([rect]) feat.setGeometry(geometry) diff --git a/python/plugins/processing/algs/qgis/FieldPyculator.py b/python/plugins/processing/algs/qgis/FieldPyculator.py index 8d8c4e0b8ec..4d83b41d3a6 100644 --- a/python/plugins/processing/algs/qgis/FieldPyculator.py +++ b/python/plugins/processing/algs/qgis/FieldPyculator.py @@ -91,7 +91,7 @@ class FieldsPyculator(GeoAlgorithm): provider = layer.dataProvider() fields = provider.fields() fields.append(QgsField(fieldName, self.TYPES[fieldType], '', - fieldLength, fieldPrecision)) + fieldLength, fieldPrecision)) writer = output.getVectorWriter(fields, provider.geometryType(), layer.crs()) outFeat = QgsFeature() diff --git a/python/plugins/processing/algs/qgis/PointDistance.py b/python/plugins/processing/algs/qgis/PointDistance.py index a1ea39d5a14..552a7bac813 100644 --- a/python/plugins/processing/algs/qgis/PointDistance.py +++ b/python/plugins/processing/algs/qgis/PointDistance.py @@ -145,8 +145,8 @@ class PointDistance(GeoAlgorithm): vari += (i - mean) * (i - mean) vari = math.sqrt(vari / len(distList)) self.writer.addRecord([inID, unicode(mean), - unicode(vari), unicode(min(distList)), - unicode(max(distList))]) + unicode(vari), unicode(min(distList)), + unicode(max(distList))]) current += 1 progress.setPercentage(int(current * total)) diff --git a/python/plugins/processing/algs/qgis/Polygonize.py b/python/plugins/processing/algs/qgis/Polygonize.py index eb095ac01ae..0bd3b329450 100644 --- a/python/plugins/processing/algs/qgis/Polygonize.py +++ b/python/plugins/processing/algs/qgis/Polygonize.py @@ -97,7 +97,7 @@ class Polygonize(GeoAlgorithm): outFeat.setGeometry(QgsGeometry.fromWkt(polygon.wkt)) if self.getParameterValue(self.GEOMETRY): outFeat.setAttributes([None] * fieldsCount + [polygon.area, - polygon.length]) + polygon.length]) writer.addFeature(outFeat) current += 1 progress.setPercentage(50 + int(current * total)) diff --git a/python/plugins/processing/algs/qgis/SinglePartsToMultiparts.py b/python/plugins/processing/algs/qgis/SinglePartsToMultiparts.py index de20651d761..5bfc5d68525 100644 --- a/python/plugins/processing/algs/qgis/SinglePartsToMultiparts.py +++ b/python/plugins/processing/algs/qgis/SinglePartsToMultiparts.py @@ -93,7 +93,7 @@ class SinglePartsToMultiparts(GeoAlgorithm): outFeat.setAttributes(attrs) outGeom = QgsGeometry(self.convertGeometry(multi_feature, - vType)) + vType)) outFeat.setGeometry(outGeom) writer.addFeature(outFeat) diff --git a/python/plugins/processing/algs/qgis/UniqueValues.py b/python/plugins/processing/algs/qgis/UniqueValues.py index 197f4c59e98..d0b8be3a667 100644 --- a/python/plugins/processing/algs/qgis/UniqueValues.py +++ b/python/plugins/processing/algs/qgis/UniqueValues.py @@ -63,7 +63,7 @@ class UniqueValues(GeoAlgorithm): self.createHTML(outputFile, values) self.setOutputValue(self.TOTAL_VALUES, len(values)) self.setOutputValue(self.UNIQUE_VALUES, ';'.join([unicode(v) for v in - values])) + values])) def createHTML(self, outputFile, algData): f = codecs.open(outputFile, 'w', encoding='utf-8') diff --git a/python/plugins/processing/algs/qgis/VoronoiPolygons.py b/python/plugins/processing/algs/qgis/VoronoiPolygons.py index a866cc4ede3..e73b341200c 100644 --- a/python/plugins/processing/algs/qgis/VoronoiPolygons.py +++ b/python/plugins/processing/algs/qgis/VoronoiPolygons.py @@ -93,7 +93,7 @@ class VoronoiPolygons(GeoAlgorithm): uniqueSet = Set(item for item in pts) ids = [pts.index(item) for item in uniqueSet] sl = voronoi.SiteList([voronoi.Site(i[0], i[1], sitenum=j) for (j, - i) in enumerate(uniqueSet)]) + i) in enumerate(uniqueSet)]) voronoi.voronoi(sl, c) inFeat = QgsFeature() @@ -223,9 +223,9 @@ class VoronoiPolygons(GeoAlgorithm): ) if x1 or x2 or y1 or y2: lines.append(QgsPoint(x1 + extent.xMinimum(), y1 - + extent.yMinimum())) + + extent.yMinimum())) lines.append(QgsPoint(x2 + extent.xMinimum(), y2 - + extent.yMinimum())) + + extent.yMinimum())) if 0 - exX in (x1, x2): hasXMin = True if 0 - exY in (y1, y2): @@ -237,15 +237,15 @@ class VoronoiPolygons(GeoAlgorithm): if hasXMin: if hasYMax: lines.append(QgsPoint(extent.xMinimum() - exX, height - + extent.yMinimum() + exY)) + + extent.yMinimum() + exY)) if hasYMin: lines.append(QgsPoint(extent.xMinimum() - exX, - extent.yMinimum() - exY)) + extent.yMinimum() - exY)) if hasXMax: if hasYMax: lines.append(QgsPoint(width + extent.xMinimum() + exX, height - + extent.yMinimum() + exY)) + + extent.yMinimum() + exY)) if hasYMin: lines.append(QgsPoint(width + extent.xMinimum() + exX, - extent.yMinimum() - exY)) + extent.yMinimum() - exY)) return lines diff --git a/python/plugins/processing/algs/qgis/postgis_utils.py b/python/plugins/processing/algs/qgis/postgis_utils.py index 131b4e5659d..e06486aa5a3 100644 --- a/python/plugins/processing/algs/qgis/postgis_utils.py +++ b/python/plugins/processing/algs/qgis/postgis_utils.py @@ -295,7 +295,7 @@ class GeoDB: def get_table_rows(self, table, schema=None): c = self.con.cursor() self._exec_sql(c, 'SELECT COUNT(*) FROM %s' % self._table_name(schema, - table)) + table)) return c.fetchone()[0] def get_table_fields(self, table, schema=None): diff --git a/python/plugins/processing/algs/qgis/scripts/Fill_holes.py b/python/plugins/processing/algs/qgis/scripts/Fill_holes.py index 22364e973ae..fe6eb64dbfd 100644 --- a/python/plugins/processing/algs/qgis/scripts/Fill_holes.py +++ b/python/plugins/processing/algs/qgis/scripts/Fill_holes.py @@ -22,23 +22,23 @@ resgeom = QgsGeometry() resfeat = QgsFeature() for feat in processing.features(polyLayer): - progress.setPercentage(int(100 * l / n)) - l += 1 + progress.setPercentage(int(100 * l / n)) + l += 1 - g = loads(feat.geometry().asWkb()) + g = loads(feat.geometry().asWkb()) - if g.geom_type == 'MultiPolygon': - resg = [Polygon(p.exterior, - [r for r in p.interiors if Polygon(r).area > Max_area]) for p in g] + if g.geom_type == 'MultiPolygon': + resg = [Polygon(p.exterior, + [r for r in p.interiors if Polygon(r).area > Max_area]) for p in g] - else: - resg = [Polygon(g.exterior, - [r for r in g.interiors if Polygon(r).area > Max_area])] + else: + resg = [Polygon(g.exterior, + [r for r in g.interiors if Polygon(r).area > Max_area])] - resgeom = QgsGeometry().fromWkt(dumps(MultiPolygon(resg))) + resgeom = QgsGeometry().fromWkt(dumps(MultiPolygon(resg))) - resfeat.setAttributes(feat.attributes()) - resfeat.setGeometry(resgeom) - writer.addFeature(resfeat) + resfeat.setAttributes(feat.attributes()) + resfeat.setGeometry(resgeom) + writer.addFeature(resfeat) del writer diff --git a/python/plugins/processing/algs/qgis/scripts/Keep_n_biggest_parts.py b/python/plugins/processing/algs/qgis/scripts/Keep_n_biggest_parts.py index fa52a2d50b8..8a9044f5559 100644 --- a/python/plugins/processing/algs/qgis/scripts/Keep_n_biggest_parts.py +++ b/python/plugins/processing/algs/qgis/scripts/Keep_n_biggest_parts.py @@ -8,8 +8,8 @@ from operator import itemgetter To_keep = int(To_keep) if To_keep < 1: - progress.setInfo("'To keep' value has been modified to be at least 1.") - To_keep = 1 + progress.setInfo("'To keep' value has been modified to be at least 1.") + To_keep = 1 polyLayer = processing.getObject(Polygons) @@ -20,23 +20,23 @@ writer = processing.VectorWriter(Results, None, polyPrder.fields(), for n, feat in enumerate(processing.features(polyLayer)): - progress.setPercentage(int(100 * n / count)) - geom = feat.geometry() - if geom.isMultipart(): - featres = feat - geoms = geom.asGeometryCollection() - geomarea = [(i, geoms[i].area()) for i in range(len(geoms))] - geomarea.sort(key=itemgetter(1)) - if To_keep == 1: - featres.setGeometry(geoms[geomarea[-1][0]]) - elif To_keep > len(geoms): - featres.setGeometry(geom) - else: - featres.setGeometry(geom) - geomres = [geoms[i].asPolygon() for i, a in geomarea[-1 * To_keep:]] - featres.setGeometry(QgsGeometry.fromMultiPolygon(geomres)) - writer.addFeature(featres) + progress.setPercentage(int(100 * n / count)) + geom = feat.geometry() + if geom.isMultipart(): + featres = feat + geoms = geom.asGeometryCollection() + geomarea = [(i, geoms[i].area()) for i in range(len(geoms))] + geomarea.sort(key=itemgetter(1)) + if To_keep == 1: + featres.setGeometry(geoms[geomarea[-1][0]]) + elif To_keep > len(geoms): + featres.setGeometry(geom) else: - writer.addFeature(feat) + featres.setGeometry(geom) + geomres = [geoms[i].asPolygon() for i, a in geomarea[-1 * To_keep:]] + featres.setGeometry(QgsGeometry.fromMultiPolygon(geomres)) + writer.addFeature(featres) + else: + writer.addFeature(feat) del writer diff --git a/python/plugins/processing/algs/r/RAlgorithm.py b/python/plugins/processing/algs/r/RAlgorithm.py index 7307a76efeb..41ba75f656f 100644 --- a/python/plugins/processing/algs/r/RAlgorithm.py +++ b/python/plugins/processing/algs/r/RAlgorithm.py @@ -342,7 +342,7 @@ class RAlgorithm(GeoAlgorithm): commands.append(param.name + ' <- read.csv("' + value + '", head=TRUE, sep=",")') elif isinstance(param, (ParameterTableField, ParameterString, - ParameterFile)): + ParameterFile)): commands.append(param.name + '="' + param.value + '"') elif isinstance(param, (ParameterNumber, ParameterSelection)): commands.append(param.name + '=' + unicode(param.value)) diff --git a/python/plugins/processing/algs/saga/SagaAlgorithm213.py b/python/plugins/processing/algs/saga/SagaAlgorithm213.py index 3738c9983f7..90d0500b081 100644 --- a/python/plugins/processing/algs/saga/SagaAlgorithm213.py +++ b/python/plugins/processing/algs/saga/SagaAlgorithm213.py @@ -121,7 +121,7 @@ class SagaAlgorithm213(SagaAlgorithm212): if param.value is None: continue if isinstance(param, (ParameterRaster, ParameterVector, - ParameterTable)): + ParameterTable)): value = param.value if value in self.exportedLayers.keys(): command += ' -' + param.name + ' "' \ diff --git a/python/plugins/processing/core/ProcessingConfig.py b/python/plugins/processing/core/ProcessingConfig.py index 421978ea6d7..e0ab20d7e30 100644 --- a/python/plugins/processing/core/ProcessingConfig.py +++ b/python/plugins/processing/core/ProcessingConfig.py @@ -137,13 +137,13 @@ class ProcessingConfig: ProcessingConfig.tr('General'), ProcessingConfig.DEFAULT_OUTPUT_VECTOR_LAYER_EXT, ProcessingConfig.tr('Default output vector layer extension'), extensions[0], - valuetype=Setting.SELECTION, options=extensions)) + valuetype=Setting.SELECTION, options=extensions)) extensions = processing.tools.dataobjects.getSupportedOutputRasterLayerExtensions() ProcessingConfig.addSetting(Setting( ProcessingConfig.tr('General'), ProcessingConfig.DEFAULT_OUTPUT_RASTER_LAYER_EXT, ProcessingConfig.tr('Default output raster layer extension'), extensions[0], - valuetype=Setting.SELECTION, options=extensions)) + valuetype=Setting.SELECTION, options=extensions)) @staticmethod def setGroupIcon(group, icon): diff --git a/python/plugins/processing/gui/NumberInputDialog.py b/python/plugins/processing/gui/NumberInputDialog.py index c35a820d507..ccf43d0aa03 100644 --- a/python/plugins/processing/gui/NumberInputDialog.py +++ b/python/plugins/processing/gui/NumberInputDialog.py @@ -68,13 +68,13 @@ class NumberInputDialog(BASE, WIDGET): layerItem = QTreeWidgetItem() layerItem.setText(0, unicode(layer.name())) layerItem.addChild(TreeValueItem(self.tr('Min X'), - layer.extent().xMinimum())) + layer.extent().xMinimum())) layerItem.addChild(TreeValueItem(self.tr('Max X'), - layer.extent().xMaximum())) + layer.extent().xMaximum())) layerItem.addChild(TreeValueItem(self.tr('Min Y'), - layer.extent().yMinimum())) + layer.extent().yMinimum())) layerItem.addChild(TreeValueItem(self.tr('Max Y'), - layer.extent().yMaximum())) + layer.extent().yMaximum())) if isinstance(layer, QgsRasterLayer): cellsize = (layer.extent().xMaximum() - layer.extent().xMinimum()) / layer.width() @@ -93,11 +93,11 @@ class NumberInputDialog(BASE, WIDGET): layerItem.setText(0, unicode(layer.name())) layerItem.addChild(TreeValueItem(self.tr('Mean'), stats.mean)) layerItem.addChild(TreeValueItem(self.tr('Std. deviation'), - stats.stdDev)) + stats.stdDev)) layerItem.addChild(TreeValueItem(self.tr('Max value'), - stats.maximumValue)) + stats.maximumValue)) layerItem.addChild(TreeValueItem(self.tr('Min value'), - stats.minimumValue)) + stats.minimumValue)) layersItem.addChild(layerItem) canvasItem = QTreeWidgetItem() diff --git a/python/plugins/processing/gui/ScriptEdit.py b/python/plugins/processing/gui/ScriptEdit.py index a1479474c42..cbdcc49a59e 100644 --- a/python/plugins/processing/gui/ScriptEdit.py +++ b/python/plugins/processing/gui/ScriptEdit.py @@ -192,7 +192,7 @@ class ScriptEdit(QsciScintilla): settings = QSettings() useDefaultAPI = bool(settings.value('pythonConsole/preloadAPI', - True)) + True)) if useDefaultAPI: # Load QGIS API shipped with Python console self.api.loadPrepared( diff --git a/python/plugins/processing/gui/ScriptEditorDialog.py b/python/plugins/processing/gui/ScriptEditorDialog.py index 76cb622d523..1870be0f76b 100644 --- a/python/plugins/processing/gui/ScriptEditorDialog.py +++ b/python/plugins/processing/gui/ScriptEditorDialog.py @@ -228,8 +228,8 @@ class ScriptEditorDialog(BASE, WIDGET): filterName = self.tr('Processing R script (*.rsx)') self.filename = unicode(QFileDialog.getSaveFileName(self, - self.tr('Save script'), scriptDir, - filterName)) + self.tr('Save script'), scriptDir, + filterName)) if self.filename: if self.algType == self.SCRIPT_PYTHON and \ diff --git a/python/plugins/processing/modeler/CalculatorModelerAlgorithm.py b/python/plugins/processing/modeler/CalculatorModelerAlgorithm.py index 4c5fd4fab95..76b9f119a44 100644 --- a/python/plugins/processing/modeler/CalculatorModelerAlgorithm.py +++ b/python/plugins/processing/modeler/CalculatorModelerAlgorithm.py @@ -54,7 +54,7 @@ class CalculatorModelerAlgorithm(GeoAlgorithm): self.tr('Formula', 'CalculatorModelerAlgorithm'), '')) for i in range(AVAILABLE_VARIABLES): self.addParameter(ParameterNumber(NUMBER - + unicode(i), 'dummy')) + + unicode(i), 'dummy')) self.addOutput(OutputNumber(RESULT, self.tr('Result', 'CalculatorModelerAlgorithm'))) diff --git a/python/plugins/processing/modeler/ModelerArrowItem.py b/python/plugins/processing/modeler/ModelerArrowItem.py index 4e6c9cad56c..e82f09f593a 100644 --- a/python/plugins/processing/modeler/ModelerArrowItem.py +++ b/python/plugins/processing/modeler/ModelerArrowItem.py @@ -66,7 +66,7 @@ class ModelerArrowItem(QGraphicsPathItem): self.setFlag(QGraphicsItem.ItemIsSelectable, False) self.myColor = Qt.gray self.setPen(QPen(self.myColor, 1, Qt.SolidLine, - Qt.RoundCap, Qt.RoundJoin)) + Qt.RoundCap, Qt.RoundJoin)) self.setZValue(0) def updatePath(self): diff --git a/python/plugins/processing/modeler/ModelerGraphicItem.py b/python/plugins/processing/modeler/ModelerGraphicItem.py index 52403e89ece..71b72deaf73 100644 --- a/python/plugins/processing/modeler/ModelerGraphicItem.py +++ b/python/plugins/processing/modeler/ModelerGraphicItem.py @@ -263,12 +263,12 @@ class ModelerGraphicItem(QGraphicsItem): painter.drawText(pt, 'Out') if not self.element.outputsFolded: for i, out in enumerate(self.element.algorithm.outputs): - text = self.getAdjustedText(out.description) - h = fm.height() * 1.2 * (i + 2) - h = h + ModelerGraphicItem.BOX_HEIGHT / 2.0 - pt = QPointF(-ModelerGraphicItem.BOX_WIDTH / 2 - + 33, h) - painter.drawText(pt, text) + text = self.getAdjustedText(out.description) + h = fm.height() * 1.2 * (i + 2) + h = h + ModelerGraphicItem.BOX_HEIGHT / 2.0 + pt = QPointF(-ModelerGraphicItem.BOX_WIDTH / 2 + + 33, h) + painter.drawText(pt, text) if self.pixmap: painter.drawPixmap(-(ModelerGraphicItem.BOX_WIDTH / 2.0) + 3, -8, self.pixmap) @@ -354,11 +354,11 @@ class FlatButtonGraphicItem(QGraphicsItem): if self.isIn: painter.setPen(QPen(Qt.transparent, 1)) painter.setBrush(QBrush(Qt.lightGray, - Qt.SolidPattern)) + Qt.SolidPattern)) else: painter.setPen(QPen(Qt.transparent, 1)) painter.setBrush(QBrush(Qt.transparent, - Qt.SolidPattern)) + Qt.SolidPattern)) painter.drawRect(rect) painter.drawPixmap(pt.x(), pt.y(), self.pixmap) diff --git a/python/plugins/processing/modeler/RasterLayerBoundsAlgorithm.py b/python/plugins/processing/modeler/RasterLayerBoundsAlgorithm.py index 3cf3b6fffb9..ec88f7f2ebd 100644 --- a/python/plugins/processing/modeler/RasterLayerBoundsAlgorithm.py +++ b/python/plugins/processing/modeler/RasterLayerBoundsAlgorithm.py @@ -61,6 +61,6 @@ class RasterLayerBoundsAlgorithm(GeoAlgorithm): self.setOutputValue(self.YMIN, layer.extent().yMinimum()) self.setOutputValue(self.YMAX, layer.extent().yMaximum()) self.setOutputValue(self.EXTENT, (layer.extent().xMinimum(), - layer.extent().xMaximum(), - layer.extent().yMinimum(), - layer.extent().yMaximum())) + layer.extent().xMaximum(), + layer.extent().yMinimum(), + layer.extent().yMaximum())) diff --git a/python/plugins/processing/modeler/VectorLayerBoundsAlgorithm.py b/python/plugins/processing/modeler/VectorLayerBoundsAlgorithm.py index 05ca1e9e876..dafc9047df1 100644 --- a/python/plugins/processing/modeler/VectorLayerBoundsAlgorithm.py +++ b/python/plugins/processing/modeler/VectorLayerBoundsAlgorithm.py @@ -61,6 +61,6 @@ class VectorLayerBoundsAlgorithm(GeoAlgorithm): self.setOutputValue(self.YMIN, layer.extent().yMinimum()) self.setOutputValue(self.YMAX, layer.extent().yMaximum()) self.setOutputValue(self.EXTENT, (layer.extent().xMinimum(), - layer.extent().xMaximum(), - layer.extent().yMinimum(), - layer.extent().yMaximum())) + layer.extent().xMaximum(), + layer.extent().yMinimum(), + layer.extent().yMaximum())) diff --git a/python/plugins/processing/script/ScriptAlgorithmProvider.py b/python/plugins/processing/script/ScriptAlgorithmProvider.py index b11ca522a3b..9d3159ff641 100644 --- a/python/plugins/processing/script/ScriptAlgorithmProvider.py +++ b/python/plugins/processing/script/ScriptAlgorithmProvider.py @@ -46,9 +46,9 @@ class ScriptAlgorithmProvider(AlgorithmProvider): def __init__(self): AlgorithmProvider.__init__(self) self.actions.extend([CreateNewScriptAction(self.tr('Create new script', 'ScriptAlgorithmProvider'), - CreateNewScriptAction.SCRIPT_PYTHON), - AddScriptFromFileAction(), - GetScriptsAction()]) + CreateNewScriptAction.SCRIPT_PYTHON), + AddScriptFromFileAction(), + GetScriptsAction()]) self.contextMenuActions = \ [EditScriptAction(EditScriptAction.SCRIPT_PYTHON), DeleteScriptAction(DeleteScriptAction.SCRIPT_PYTHON)] @@ -56,9 +56,9 @@ class ScriptAlgorithmProvider(AlgorithmProvider): def initializeSettings(self): AlgorithmProvider.initializeSettings(self) ProcessingConfig.addSetting(Setting(self.getDescription(), - ScriptUtils.SCRIPTS_FOLDER, - self.tr('Scripts folder', 'ScriptAlgorithmProvider'), - ScriptUtils.scriptsFolder(), valuetype=Setting.FOLDER)) + ScriptUtils.SCRIPTS_FOLDER, + self.tr('Scripts folder', 'ScriptAlgorithmProvider'), + ScriptUtils.scriptsFolder(), valuetype=Setting.FOLDER)) def unload(self): AlgorithmProvider.unload(self) diff --git a/python/plugins/processing/tests/qgis_interface.py b/python/plugins/processing/tests/qgis_interface.py index 2cca03d4411..eebdbe87b67 100644 --- a/python/plugins/processing/tests/qgis_interface.py +++ b/python/plugins/processing/tests/qgis_interface.py @@ -47,7 +47,7 @@ class QgisInterface(QObject): self.testVector]) self.statusBar = type('FakeStatusBar', (), {'showMessage': lambda _, - m: None})() + m: None})() def zoomFull(self): """Zoom to the map full extent""" @@ -98,7 +98,7 @@ class QgisInterface(QObject): """ return type('FakeMainWindow', (), {'statusBar': lambda _: - self.statusBar})() + self.statusBar})() def addDockWidget(self, area, dockwidget): """Add a dock widget to the main window""" @@ -106,4 +106,4 @@ class QgisInterface(QObject): def legendInterface(self): return type('FakeLInterface', (), {'layers': lambda _: - [self.testRaster, self.testVector]})() + [self.testRaster, self.testVector]})() diff --git a/python/plugins/processing/tests/test.py b/python/plugins/processing/tests/test.py index 0ef6e22d033..9015449e31a 100644 --- a/python/plugins/processing/tests/test.py +++ b/python/plugins/processing/tests/test.py @@ -90,7 +90,7 @@ class ProcessingProviderTestCase(unittest.TestCase): self.alg = alg self.threaded = threaded self.msg = 'ALG %s (%s %s)' % (self.algId, {True: 'threaded', - False: 'unthreaded'}[threaded], dialog) + False: 'unthreaded'}[threaded], dialog) unittest.TestCase.__init__(self, 'runalg_%s' % dialog) def gen_test_parameters(self, alg, doSet=False): diff --git a/python/plugins/processing/tools/vector.py b/python/plugins/processing/tools/vector.py index 951e1621179..db9dfaf5ef8 100644 --- a/python/plugins/processing/tools/vector.py +++ b/python/plugins/processing/tools/vector.py @@ -592,7 +592,7 @@ class VectorWriter: _runSQL("CREATE TABLE %s.%s (%s)" % (uri.schema(), uri.table().lower(), fieldsdesc)) _runSQL("SELECT AddGeometryColumn('{schema}', '{table}', 'the_geom', {srid}, '{typmod}', 2)".format( table=uri.table().lower(), schema=uri.schema(), srid=crs.authid().split(":")[-1], - typmod=GEOM_TYPE_MAP[geometryType].upper())) + typmod=GEOM_TYPE_MAP[geometryType].upper())) self.layer = QgsVectorLayer(uri.uri(), uri.table(), "postgres") self.writer = self.layer.dataProvider() @@ -622,7 +622,7 @@ class VectorWriter: _runSQL("CREATE TABLE %s (%s)" % (uri.table().lower(), fieldsdesc)) _runSQL("SELECT AddGeometryColumn('{table}', 'the_geom', {srid}, '{typmod}', 2)".format( table=uri.table().lower(), srid=crs.authid().split(":")[-1], - typmod=GEOM_TYPE_MAP[geometryType].upper())) + typmod=GEOM_TYPE_MAP[geometryType].upper())) self.layer = QgsVectorLayer(uri.uri(), uri.table(), "spatialite") self.writer = self.layer.dataProvider() diff --git a/python/pyplugin_installer/installer_data.py b/python/pyplugin_installer/installer_data.py index bcc9458e26b..ce8153adfe5 100644 --- a/python/pyplugin_installer/installer_data.py +++ b/python/pyplugin_installer/installer_data.py @@ -450,7 +450,7 @@ class Repositories(QObject): #if compatible, add the plugin to the list if not pluginNodes.item(i).firstChildElement("disabled").text().strip().upper() in ["TRUE", "YES"]: if isCompatible(QGis.QGIS_VERSION, qgisMinimumVersion, qgisMaximumVersion): - #add the plugin to the cache + #add the plugin to the cache plugins.addFromRepository(plugin) self.mRepositories[reposName]["state"] = 2 else: diff --git a/src/plugins/grass/scripts/r.external.all.py b/src/plugins/grass/scripts/r.external.all.py index ef8a669bb3f..5dbedb28425 100644 --- a/src/plugins/grass/scripts/r.external.all.py +++ b/src/plugins/grass/scripts/r.external.all.py @@ -88,12 +88,12 @@ except: def import_directory_of_rasters(directory, recursive): for dir, dirnames, filenames in os.walk(directory): for filename in filenames: - if grass.run_command('r.external', flags=flags_string, input=os.path.join(dir, filename), band=options['band'], output=filename[:-4], title=filename[:-4]) != 0: - grass.warning('Cannot import file' + filename) + if grass.run_command('r.external', flags=flags_string, input=os.path.join(dir, filename), band=options['band'], output=filename[:-4], title=filename[:-4]) != 0: + grass.warning('Cannot import file' + filename) if not recursive: - break + break for dirname in dirnames: - import_directory_of_rasters(dirname, recursive) + import_directory_of_rasters(dirname, recursive) def main():