diff --git a/python/plugins/processing/algs/qgis/Aspect.py b/python/plugins/processing/algs/qgis/Aspect.py index 6ffb53e17df..540014f2216 100644 --- a/python/plugins/processing/algs/qgis/Aspect.py +++ b/python/plugins/processing/algs/qgis/Aspect.py @@ -32,13 +32,8 @@ from qgis.PyQt.QtGui import QIcon from qgis.analysis import QgsAspectFilter from qgis.core import (QgsProcessingParameterRasterLayer, QgsProcessingParameterNumber, - QgsProcessingParameterRasterDestination, - QgsProcessingOutputRasterLayer, - QgsFeatureSink) + QgsProcessingParameterRasterDestination) from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm -from processing.core.parameters import ParameterRaster -from processing.core.parameters import ParameterNumber -from processing.core.outputs import OutputRaster from processing.tools import raster from processing.tools.dataobjects import exportRasterLayer diff --git a/python/plugins/processing/algs/qgis/BasicStatistics.py b/python/plugins/processing/algs/qgis/BasicStatistics.py index fa754e72da5..c6a96bebd37 100644 --- a/python/plugins/processing/algs/qgis/BasicStatistics.py +++ b/python/plugins/processing/algs/qgis/BasicStatistics.py @@ -32,11 +32,9 @@ from qgis.PyQt.QtCore import QVariant from qgis.PyQt.QtGui import QIcon from qgis.core import (QgsStatisticalSummary, - QgsFeatureSink, QgsStringStatisticalSummary, QgsDateTimeStatisticalSummary, QgsFeatureRequest, - QgsProcessingUtils, QgsProcessingParameterFeatureSource, QgsProcessingParameterField, QgsProcessingParameterFileDestination, diff --git a/python/plugins/processing/algs/qgis/ConcaveHull.py b/python/plugins/processing/algs/qgis/ConcaveHull.py index 4f5a35e31ce..2d5f1503756 100644 --- a/python/plugins/processing/algs/qgis/ConcaveHull.py +++ b/python/plugins/processing/algs/qgis/ConcaveHull.py @@ -26,9 +26,7 @@ __copyright__ = '(C) 2014, Piotr Pociask' __revision__ = '$Format:%H$' -from qgis.core import (QgsFeatureRequest, - QgsFeature, - QgsGeometry, +from qgis.core import (QgsFeature, QgsFeatureSink, QgsWkbTypes, QgsProcessing, diff --git a/python/plugins/processing/algs/qgis/CreateAttributeIndex.py b/python/plugins/processing/algs/qgis/CreateAttributeIndex.py index 59c01497c3d..f4694852950 100644 --- a/python/plugins/processing/algs/qgis/CreateAttributeIndex.py +++ b/python/plugins/processing/algs/qgis/CreateAttributeIndex.py @@ -29,7 +29,6 @@ from qgis.core import (QgsVectorDataProvider, QgsFields, QgsProcessingParameterVectorLayer, QgsProcessingParameterField, - QgsProcessingParameterDefinition, QgsProcessingOutputVectorLayer) from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm diff --git a/python/plugins/processing/algs/qgis/ImportIntoPostGIS.py b/python/plugins/processing/algs/qgis/ImportIntoPostGIS.py index a5fb38003e3..9f01ca4ea20 100644 --- a/python/plugins/processing/algs/qgis/ImportIntoPostGIS.py +++ b/python/plugins/processing/algs/qgis/ImportIntoPostGIS.py @@ -27,9 +27,7 @@ __revision__ = '$Format:%H$' from qgis.core import (QgsVectorLayerExporter, QgsSettings, - QgsApplication, QgsFeatureSink, - QgsProcessingUtils, QgsProcessingParameterFeatureSource, QgsProcessingParameterString, QgsProcessingParameterField, diff --git a/python/plugins/processing/algs/qgis/PostGISExecuteSQL.py b/python/plugins/processing/algs/qgis/PostGISExecuteSQL.py index 795b9ff0777..0d3fbadef93 100644 --- a/python/plugins/processing/algs/qgis/PostGISExecuteSQL.py +++ b/python/plugins/processing/algs/qgis/PostGISExecuteSQL.py @@ -26,8 +26,7 @@ __copyright__ = '(C) 2012, Victor Olaya, Carterix Geomatics' __revision__ = '$Format:%H$' -from qgis.core import (QgsApplication, - QgsProcessingParameterString) +from qgis.core import (QgsProcessingParameterString) from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException from processing.tools import postgis diff --git a/python/plugins/processing/algs/qgis/SelectByAttribute.py b/python/plugins/processing/algs/qgis/SelectByAttribute.py index 46e97d0019c..8442355bb3f 100644 --- a/python/plugins/processing/algs/qgis/SelectByAttribute.py +++ b/python/plugins/processing/algs/qgis/SelectByAttribute.py @@ -25,10 +25,8 @@ __copyright__ = '(C) 2010, Michael Minn' __revision__ = '$Format:%H$' -from qgis.core import (QgsApplication) from qgis.PyQt.QtCore import QVariant from qgis.core import (QgsExpression, - QgsProcessingUtils, QgsProcessingParameterVectorLayer, QgsProcessingParameterField, QgsProcessingParameterEnum, diff --git a/python/plugins/processing/algs/qgis/SimplifyGeometries.py b/python/plugins/processing/algs/qgis/SimplifyGeometries.py index ec016e57c18..1507bfbbf87 100644 --- a/python/plugins/processing/algs/qgis/SimplifyGeometries.py +++ b/python/plugins/processing/algs/qgis/SimplifyGeometries.py @@ -32,13 +32,13 @@ from qgis.PyQt.QtGui import QIcon from qgis.core import (QgsMapToPixelSimplifier, QgsMessageLog, QgsFeatureSink, + QgsProcessing, QgsProcessingParameterFeatureSource, QgsProcessingParameterFeatureSink, QgsProcessingParameterEnum, QgsProcessingParameterNumber) from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm -from processing.tools import dataobjects pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0] @@ -62,7 +62,7 @@ class SimplifyGeometries(QgisAlgorithm): def initAlgorithm(self, config=None): self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.tr('Input layer'), - [dataobjects.TYPE_VECTOR_POLYGON, dataobjects.TYPE_VECTOR_LINE])) + [QgsProcessing.TypeVectorPolygon, QgsProcessing.TypeVectorLine])) self.methods = [self.tr('Distance (Douglas-Peucker)'), 'Snap to grid', 'Area (Visvalingam)'] diff --git a/python/plugins/processing/algs/qgis/Smooth.py b/python/plugins/processing/algs/qgis/Smooth.py index 624c74f8102..f9b8e8238a3 100644 --- a/python/plugins/processing/algs/qgis/Smooth.py +++ b/python/plugins/processing/algs/qgis/Smooth.py @@ -26,13 +26,13 @@ __copyright__ = '(C) 2015, Nyall Dawson' __revision__ = '$Format:%H$' from qgis.core import (QgsFeatureSink, + QgsProcessing, QgsProcessingParameterFeatureSource, QgsProcessingParameterFeatureSink, QgsProcessingParameterNumber) from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException -from processing.tools import dataobjects class Smooth(QgisAlgorithm): @@ -51,7 +51,7 @@ class Smooth(QgisAlgorithm): def initAlgorithm(self, config=None): self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, - self.tr('Input layer'), [dataobjects.TYPE_VECTOR_POLYGON, dataobjects.TYPE_VECTOR_LINE])) + self.tr('Input layer'), [QgsProcessing.TypeVectorPolygon, QgsProcessing.TypeVectorLine])) self.addParameter(QgsProcessingParameterNumber(self.ITERATIONS, self.tr('Iterations'), defaultValue=1, minValue=1, maxValue=10)) diff --git a/python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py b/python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py index c303c3c6912..664ebab8036 100644 --- a/python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py +++ b/python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py @@ -27,7 +27,6 @@ __copyright__ = '(C) 2016, Mathieu Pellerin' __revision__ = '$Format:%H$' from qgis.core import (QgsDataSourceUri, - QgsApplication, QgsProcessingParameterVectorLayer, QgsProcessingParameterString)