Skip to content

Commit 7bb1b7a

Browse files
nyalldawsonnyalldawson
committedJul 11, 2017
Cleanup some imports, remove use of dataobjects
·
ltr-3_40final-3_0_0
1 parent d92583c commit 7bb1b7a

File tree

10 files changed

+7
-23
lines changed

10 files changed

+7
-23
lines changed
 

‎python/plugins/processing/algs/qgis/Aspect.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,8 @@
3232
from qgis.analysis import QgsAspectFilter
3333
from qgis.core import (QgsProcessingParameterRasterLayer,
3434
QgsProcessingParameterNumber,
35-
QgsProcessingParameterRasterDestination,
36-
QgsProcessingOutputRasterLayer,
37-
QgsFeatureSink)
35+
QgsProcessingParameterRasterDestination)
3836
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
39-
from processing.core.parameters import ParameterRaster
40-
from processing.core.parameters import ParameterNumber
41-
from processing.core.outputs import OutputRaster
4237
from processing.tools import raster
4338
from processing.tools.dataobjects import exportRasterLayer
4439

‎python/plugins/processing/algs/qgis/BasicStatistics.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,9 @@
3232
from qgis.PyQt.QtGui import QIcon
3333

3434
from qgis.core import (QgsStatisticalSummary,
35-
QgsFeatureSink,
3635
QgsStringStatisticalSummary,
3736
QgsDateTimeStatisticalSummary,
3837
QgsFeatureRequest,
39-
QgsProcessingUtils,
4038
QgsProcessingParameterFeatureSource,
4139
QgsProcessingParameterField,
4240
QgsProcessingParameterFileDestination,

‎python/plugins/processing/algs/qgis/ConcaveHull.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626

2727
__revision__ = '$Format:%H$'
2828

29-
from qgis.core import (QgsFeatureRequest,
30-
QgsFeature,
31-
QgsGeometry,
29+
from qgis.core import (QgsFeature,
3230
QgsFeatureSink,
3331
QgsWkbTypes,
3432
QgsProcessing,

‎python/plugins/processing/algs/qgis/CreateAttributeIndex.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
QgsFields,
3030
QgsProcessingParameterVectorLayer,
3131
QgsProcessingParameterField,
32-
QgsProcessingParameterDefinition,
3332
QgsProcessingOutputVectorLayer)
3433

3534
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm

‎python/plugins/processing/algs/qgis/ImportIntoPostGIS.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727

2828
from qgis.core import (QgsVectorLayerExporter,
2929
QgsSettings,
30-
QgsApplication,
3130
QgsFeatureSink,
32-
QgsProcessingUtils,
3331
QgsProcessingParameterFeatureSource,
3432
QgsProcessingParameterString,
3533
QgsProcessingParameterField,

‎python/plugins/processing/algs/qgis/PostGISExecuteSQL.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626

2727
__revision__ = '$Format:%H$'
2828

29-
from qgis.core import (QgsApplication,
30-
QgsProcessingParameterString)
29+
from qgis.core import (QgsProcessingParameterString)
3130
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
3231
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
3332
from processing.tools import postgis

‎python/plugins/processing/algs/qgis/SelectByAttribute.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@
2525

2626
__revision__ = '$Format:%H$'
2727

28-
from qgis.core import (QgsApplication)
2928
from qgis.PyQt.QtCore import QVariant
3029
from qgis.core import (QgsExpression,
31-
QgsProcessingUtils,
3230
QgsProcessingParameterVectorLayer,
3331
QgsProcessingParameterField,
3432
QgsProcessingParameterEnum,

‎python/plugins/processing/algs/qgis/SimplifyGeometries.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
from qgis.core import (QgsMapToPixelSimplifier,
3333
QgsMessageLog,
3434
QgsFeatureSink,
35+
QgsProcessing,
3536
QgsProcessingParameterFeatureSource,
3637
QgsProcessingParameterFeatureSink,
3738
QgsProcessingParameterEnum,
3839
QgsProcessingParameterNumber)
3940

4041
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
41-
from processing.tools import dataobjects
4242

4343
pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
4444

@@ -62,7 +62,7 @@ def __init__(self):
6262
def initAlgorithm(self, config=None):
6363
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT,
6464
self.tr('Input layer'),
65-
[dataobjects.TYPE_VECTOR_POLYGON, dataobjects.TYPE_VECTOR_LINE]))
65+
[QgsProcessing.TypeVectorPolygon, QgsProcessing.TypeVectorLine]))
6666
self.methods = [self.tr('Distance (Douglas-Peucker)'),
6767
'Snap to grid',
6868
'Area (Visvalingam)']

‎python/plugins/processing/algs/qgis/Smooth.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
__revision__ = '$Format:%H$'
2727

2828
from qgis.core import (QgsFeatureSink,
29+
QgsProcessing,
2930
QgsProcessingParameterFeatureSource,
3031
QgsProcessingParameterFeatureSink,
3132
QgsProcessingParameterNumber)
3233

3334
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
3435
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
35-
from processing.tools import dataobjects
3636

3737

3838
class Smooth(QgisAlgorithm):
@@ -51,7 +51,7 @@ def __init__(self):
5151

5252
def initAlgorithm(self, config=None):
5353
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT,
54-
self.tr('Input layer'), [dataobjects.TYPE_VECTOR_POLYGON, dataobjects.TYPE_VECTOR_LINE]))
54+
self.tr('Input layer'), [QgsProcessing.TypeVectorPolygon, QgsProcessing.TypeVectorLine]))
5555
self.addParameter(QgsProcessingParameterNumber(self.ITERATIONS,
5656
self.tr('Iterations'),
5757
defaultValue=1, minValue=1, maxValue=10))

‎python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
__revision__ = '$Format:%H$'
2828

2929
from qgis.core import (QgsDataSourceUri,
30-
QgsApplication,
3130
QgsProcessingParameterVectorLayer,
3231
QgsProcessingParameterString)
3332

0 commit comments

Comments
 (0)
Please sign in to comment.