Fix python test imports

qgis · Jun 2, 2017 · 881dfef · 881dfef
1 parent a9d7630
commit 881dfef
Show file tree

Hide file tree

Showing 28 changed files with 30 additions and 30 deletions.
diff --git a/tests/src/python/offlineditingtestbase.py b/tests/src/python/offlineditingtestbase.py
@@ -32,7 +32,7 @@
 from qgis.core import (
     QgsFeature,
     QgsGeometry,
-    QgsPoint,
+    QgsPointXY,
     QgsFeatureRequest,
     QgsExpression,
     QgsProject,

diff --git a/tests/src/python/test_layer_dependencies.py b/tests/src/python/test_layer_dependencies.py
@@ -22,7 +22,7 @@
                        QgsSnappingConfig,
                        QgsTolerance,
                        QgsRectangle,
-                       QgsPoint,
+                       QgsPointXY,
                        QgsFeature,
                        QgsGeometry,
                        QgsLayerDefinition,

diff --git a/tests/src/python/test_provider_memory.py b/tests/src/python/test_provider_memory.py
@@ -17,7 +17,7 @@
     QgsField,
     QgsFields,
     QgsLayerDefinition,
-    QgsPoint,
+    QgsPointXY,
     QgsReadWriteContext,
     QgsVectorLayer,
     QgsFeatureRequest,

diff --git a/tests/src/python/test_provider_spatialite.py b/tests/src/python/test_provider_spatialite.py
@@ -21,7 +21,7 @@
 
 from qgis.core import (QgsVectorLayer,
                        QgsVectorDataProvider,
-                       QgsPoint,
+                       QgsPointXY,
                        QgsFeature,
                        QgsGeometry,
                        QgsProject,

diff --git a/tests/src/python/test_provider_wfs.py b/tests/src/python/test_provider_wfs.py
@@ -28,7 +28,7 @@
     QgsFeature,
     QgsGeometry,
     QgsRectangle,
-    QgsPoint,
+    QgsPointXY,
     QgsVectorDataProvider,
     QgsFeatureRequest,
     QgsApplication,

diff --git a/tests/src/python/test_qgsatlascomposition.py b/tests/src/python/test_qgsatlascomposition.py
@@ -24,7 +24,7 @@
 from qgis.PyQt.QtCore import QFileInfo, QRectF, qWarning
 from qgis.core import QgsVectorLayer, QgsProject, QgsCoordinateReferenceSystem, \
     QgsComposition, QgsFillSymbol, QgsSingleSymbolRenderer, QgsComposerLabel, QgsComposerMap, QgsFontUtils, \
-    QgsRectangle, QgsComposerLegend, QgsFeature, QgsGeometry, QgsPoint, QgsRendererCategory, QgsCategorizedSymbolRenderer, QgsMarkerSymbol
+    QgsRectangle, QgsComposerLegend, QgsFeature, QgsGeometry, QgsPointXY, QgsRendererCategory, QgsCategorizedSymbolRenderer, QgsMarkerSymbol
 from qgscompositionchecker import QgsCompositionChecker
 
 start_app()

diff --git a/tests/src/python/test_qgsattributetablemodel.py b/tests/src/python/test_qgsattributetablemodel.py
@@ -19,7 +19,7 @@
 from qgis.core import (
     QgsFeature,
     QgsGeometry,
-    QgsPoint,
+    QgsPointXY,
     QgsVectorLayer,
     QgsVectorLayerCache
 )

diff --git a/tests/src/python/test_qgsbox3d.py b/tests/src/python/test_qgsbox3d.py
@@ -15,8 +15,8 @@
 import qgis  # NOQA
 
 from qgis.core import (QgsBox3d,
+                       QgsPointXY,
                        QgsPoint,
-                       QgsPointV2,
                        QgsWkbTypes,
                        QgsRectangle)
 

diff --git a/tests/src/python/test_qgscomposition.py b/tests/src/python/test_qgscomposition.py
@@ -20,7 +20,7 @@
 from qgis.PyQt.QtXml import QDomDocument
 
 from qgis.core import (QgsComposition,
-                       QgsPoint,
+                       QgsPointXY,
                        QgsRasterLayer,
                        QgsMultiBandColorRenderer,
                        QgsProject)

diff --git a/tests/src/python/test_qgsdistancearea.py b/tests/src/python/test_qgsdistancearea.py
@@ -16,7 +16,7 @@
 import math
 
 from qgis.core import (QgsGeometry,
-                       QgsPoint,
+                       QgsPointXY,
                        QgsDistanceArea,
                        QgsCoordinateReferenceSystem,
                        QgsUnitTypes

diff --git a/tests/src/python/test_qgseditwidgets.py b/tests/src/python/test_qgseditwidgets.py
@@ -14,7 +14,7 @@
 
 import qgis  # NOQA
 
-from qgis.core import (QgsProject, QgsFeature, QgsGeometry, QgsPoint, QgsVectorLayer, NULL, QgsField)
+from qgis.core import (QgsProject, QgsFeature, QgsGeometry, QgsPointXY, QgsVectorLayer, NULL, QgsField)
 from qgis.gui import QgsGui
 
 from qgis.testing import start_app, unittest

diff --git a/tests/src/python/test_qgsfeature.py b/tests/src/python/test_qgsfeature.py
@@ -15,7 +15,7 @@
 import qgis  # NOQA
 
 import os
-from qgis.core import QgsFeature, QgsGeometry, QgsPoint, QgsVectorLayer, NULL, QgsFields, QgsField
+from qgis.core import QgsFeature, QgsGeometry, QgsPointXY, QgsVectorLayer, NULL, QgsFields, QgsField
 from qgis.testing import start_app, unittest
 from utilities import unitTestDataPath
 

diff --git a/tests/src/python/test_qgsfeaturesink.py b/tests/src/python/test_qgsfeaturesink.py
@@ -19,7 +19,7 @@
                        QgsVectorLayer,
                        QgsFeature,
                        QgsGeometry,
-                       QgsPoint,
+                       QgsPointXY,
                        QgsField,
                        QgsFields,
                        QgsCoordinateReferenceSystem,

diff --git a/tests/src/python/test_qgsgeometry.py b/tests/src/python/test_qgsgeometry.py
@@ -20,8 +20,8 @@
     QgsGeometry,
     QgsVectorLayer,
     QgsFeature,
+    QgsPointXY,
     QgsPoint,
-    QgsPointV2,
     QgsCircularString,
     QgsCompoundCurve,
     QgsCurvePolygon,
@@ -1936,7 +1936,7 @@ def testTypeInformation(self):
             (QgsMultiPointV2, "MultiPoint", QgsWkbTypes.MultiPoint),
             (QgsMultiPolygonV2, "MultiPolygon", QgsWkbTypes.MultiPolygon),
             (QgsMultiSurface, "MultiSurface", QgsWkbTypes.MultiSurface),
-            (QgsPointV2, "Point", QgsWkbTypes.Point),
+            (QgsPoint, "Point", QgsWkbTypes.Point),
             (QgsPolygonV2, "Polygon", QgsWkbTypes.Polygon),
         ]
 

diff --git a/tests/src/python/test_qgsgraduatedsymbolrenderer.py b/tests/src/python/test_qgsgraduatedsymbolrenderer.py
@@ -23,7 +23,7 @@
                        QgsVectorLayer,
                        QgsFeature,
                        QgsGeometry,
-                       QgsPoint,
+                       QgsPointXY,
                        QgsReadWriteContext,
                        QgsRenderContext
                        )

diff --git a/tests/src/python/test_qgsissue7244.py b/tests/src/python/test_qgsissue7244.py
@@ -16,7 +16,7 @@
 
 import os
 
-from qgis.core import QgsPoint, QgsVectorLayer
+from qgis.core import QgsPointXY, QgsVectorLayer
 
 from qgis.testing import start_app, unittest
 

diff --git a/tests/src/python/test_qgsjsonutils.py b/tests/src/python/test_qgsjsonutils.py
@@ -24,7 +24,7 @@
                        QgsFields,
                        QgsWkbTypes,
                        QgsGeometry,
-                       QgsPointV2,
+                       QgsPoint,
                        QgsLineString,
                        NULL,
                        QgsVectorLayer,

diff --git a/tests/src/python/test_qgsmapcanvasannotationitem.py b/tests/src/python/test_qgsmapcanvasannotationitem.py
@@ -17,7 +17,7 @@
 from qgis.core import (QgsTextAnnotation,
                        QgsCoordinateReferenceSystem,
                        QgsRectangle,
-                       QgsPoint,
+                       QgsPointXY,
                        QgsVectorLayer,
                        QgsFeature,
                        QgsGeometry,

diff --git a/tests/src/python/test_qgsrangewidgets.py b/tests/src/python/test_qgsrangewidgets.py
@@ -14,7 +14,7 @@
 
 import qgis  # NOQA
 
-from qgis.core import QgsFeature, QgsGeometry, QgsPoint, QgsVectorLayer, NULL
+from qgis.core import QgsFeature, QgsGeometry, QgsPointXY, QgsVectorLayer, NULL
 from qgis.gui import QgsGui
 from qgis.testing import start_app, unittest
 

diff --git a/tests/src/python/test_qgsrasterlayer.py b/tests/src/python/test_qgsrasterlayer.py
@@ -28,7 +28,7 @@
                        QgsContrastEnhancement,
                        QgsProject,
                        QgsMapSettings,
-                       QgsPoint,
+                       QgsPointXY,
                        QgsRasterMinMaxOrigin,
                        QgsRasterShader,
                        QgsRasterTransparency,

diff --git a/tests/src/python/test_qgsrelation.py b/tests/src/python/test_qgsrelation.py
@@ -18,7 +18,7 @@
                        QgsFeature,
                        QgsRelation,
                        QgsGeometry,
-                       QgsPoint,
+                       QgsPointXY,
                        QgsProject
                        )
 from qgis.testing import start_app, unittest

diff --git a/tests/src/python/test_qgsserver_wfst.py b/tests/src/python/test_qgsserver_wfst.py
@@ -46,7 +46,7 @@
     QgsVectorLayer,
     QgsFeature,
     QgsGeometry,
-    QgsPoint,
+    QgsPointXY,
     QgsRectangle,
     QgsFeatureRequest,
     QgsExpression,

diff --git a/tests/src/python/test_qgssymbollayer_readsld.py b/tests/src/python/test_qgssymbollayer_readsld.py
@@ -32,7 +32,7 @@
                        QgsFeature,
                        QgsGeometry,
                        QgsUnitTypes,
-                       QgsPoint,
+                       QgsPointXY,
                        QgsSvgMarkerSymbolLayer,
                        QgsEllipseSymbolLayer,
                        QgsSimpleFillSymbolLayer,

diff --git a/tests/src/python/test_qgsvectorfilewriter.py b/tests/src/python/test_qgsvectorfilewriter.py
@@ -21,7 +21,7 @@
                        QgsFeature,
                        QgsField,
                        QgsGeometry,
-                       QgsPoint,
+                       QgsPointXY,
                        QgsCoordinateReferenceSystem,
                        QgsVectorFileWriter,
                        QgsFeatureRequest,

diff --git a/tests/src/python/test_qgsvectorfilewritertask.py b/tests/src/python/test_qgsvectorfilewritertask.py
@@ -20,7 +20,7 @@
     QgsVectorLayer,
     QgsFeature,
     QgsGeometry,
-    QgsPoint,
+    QgsPointXY,
     QgsVectorFileWriter,
     QgsVectorFileWriterTask
 )

diff --git a/tests/src/python/test_qgsvectorlayer.py b/tests/src/python/test_qgsvectorlayer.py
@@ -28,7 +28,7 @@
                        QgsFeature,
                        QgsFeatureRequest,
                        QgsGeometry,
-                       QgsPoint,
+                       QgsPointXY,
                        QgsField,
                        QgsFieldConstraints,
                        QgsFields,
@@ -40,7 +40,7 @@
                        QgsProject,
                        QgsUnitTypes,
                        QgsAggregateCalculator,
-                       QgsPointV2,
+                       QgsPoint,
                        QgsExpressionContext,
                        QgsExpressionContextScope,
                        QgsExpressionContextUtils,

diff --git a/tests/src/python/test_qgsvectorlayereditbuffer.py b/tests/src/python/test_qgsvectorlayereditbuffer.py
@@ -19,7 +19,7 @@
 from qgis.core import (QgsVectorLayer,
                        QgsFeature,
                        QgsGeometry,
-                       QgsPoint,
+                       QgsPointXY,
                        QgsField)
 from qgis.testing import start_app, unittest
 start_app()

diff --git a/tests/src/python/test_qgsvectorlayerutils.py b/tests/src/python/test_qgsvectorlayerutils.py
@@ -19,7 +19,7 @@
                        QgsFieldConstraints,
                        QgsFeature,
                        QgsGeometry,
-                       QgsPoint,
+                       QgsPointXY,
                        NULL
                        )
 from qgis.testing import start_app, unittest