Skip to content

Commit 28bd021

Browse files
rouaultnyalldawson
authored andcommittedApr 1, 2023
Remove any trace of distutils use as it is going to be removed in python 3.12 (fixes #51532)
1 parent ce508f6 commit 28bd021

File tree

3 files changed

+30
-67
lines changed

3 files changed

+30
-67
lines changed
 

‎cmake/FindSIP.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,11 @@
3737
print("sip_version_num:%d" % sipbuild.version.SIP_VERSION)
3838
print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR)
3939

40-
from distutils.sysconfig import get_python_lib
41-
python_modules_dir = get_python_lib(plat_specific=1)
40+
import sysconfig
41+
if "deb_system" in sysconfig.get_scheme_names():
42+
python_modules_dir = sysconfig.get_path("purelib", "deb_system")
43+
else:
44+
python_modules_dir = sysconfig.get_path("purelib")
4245
print("default_sip_dir:%s" % python_modules_dir)
4346
except ImportError: # Code for SIP v4
4447
import sipconfig

‎tests/src/python/test_qgslayertreeview.py

Lines changed: 24 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@
99
__date__ = '02.04.2018'
1010
__copyright__ = 'Copyright 2018, The QGIS Project'
1111

12-
from distutils.version import StrictVersion
13-
1412
import qgis # NOQA
15-
from qgis.PyQt.Qt import PYQT_VERSION_STR
1613
from qgis.PyQt.QtCore import QStringListModel
17-
from qgis.PyQt.QtTest import QSignalSpy
14+
from qgis.PyQt.QtTest import QSignalSpy, QAbstractItemModelTester
1815
from qgis.core import (
1916
QgsLayerTreeModel,
2017
QgsProject,
@@ -26,17 +23,8 @@
2623
QgsLayerTreeViewDefaultActions,
2724
)
2825
from qgis.testing import start_app, unittest
29-
3026
from utilities import (unitTestDataPath)
3127

32-
USE_MODEL_TESTER = False
33-
34-
35-
if StrictVersion(PYQT_VERSION_STR) >= StrictVersion('5.11'):
36-
from qgis.PyQt.QtTest import QAbstractItemModelTester
37-
USE_MODEL_TESTER = True
38-
39-
4028
app = start_app()
4129
TEST_DATA_DIR = unitTestDataPath()
4230

@@ -62,8 +50,7 @@ def __init__(self, methodName):
6250
"layer5", "memory")
6351
self.project.addMapLayers([self.layer, self.layer2, self.layer3])
6452
self.model = QgsLayerTreeModel(self.project.layerTreeRoot())
65-
if USE_MODEL_TESTER:
66-
self.tester = QAbstractItemModelTester(self.model)
53+
self.tester = QAbstractItemModelTester(self.model)
6754

6855
self.groupname = "group"
6956
self.subgroupname = "sub-group"
@@ -92,16 +79,14 @@ def testSetModel(self):
9279

9380
# should work
9481
view.setModel(self.model)
95-
if USE_MODEL_TESTER:
96-
proxy_tester = QAbstractItemModelTester(view.model())
82+
proxy_tester = QAbstractItemModelTester(view.model())
9783
self.assertEqual(view.layerTreeModel(), self.model)
9884

9985
def testSetCurrentLayer(self):
10086

10187
view = QgsLayerTreeView()
10288
view.setModel(self.model)
103-
if USE_MODEL_TESTER:
104-
proxy_tester = QAbstractItemModelTester(view.model())
89+
proxy_tester = QAbstractItemModelTester(view.model())
10590
current_layer_changed_spy = QSignalSpy(view.currentLayerChanged)
10691
self.assertFalse(view.currentLayer())
10792
view.setCurrentLayer(self.layer3)
@@ -117,8 +102,7 @@ def testSetCurrentLayer(self):
117102
def testDefaultActions(self):
118103
view = QgsLayerTreeView()
119104
view.setModel(self.model)
120-
if USE_MODEL_TESTER:
121-
proxy_tester = QAbstractItemModelTester(view.model())
105+
proxy_tester = QAbstractItemModelTester(view.model())
122106
actions = QgsLayerTreeViewDefaultActions(view)
123107

124108
# show in overview action
@@ -142,8 +126,7 @@ def testMoveOutOfGroupActionLayer(self):
142126
group.addLayer(self.layer5)
143127
groupname = group.name()
144128
view.setModel(self.model)
145-
if USE_MODEL_TESTER:
146-
proxy_tester = QAbstractItemModelTester(view.model())
129+
proxy_tester = QAbstractItemModelTester(view.model())
147130
actions = QgsLayerTreeViewDefaultActions(view)
148131
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
149132
self.layer.name(),
@@ -171,8 +154,7 @@ def testMoveToTopActionLayer(self):
171154

172155
view = QgsLayerTreeView()
173156
view.setModel(self.model)
174-
if USE_MODEL_TESTER:
175-
proxy_tester = QAbstractItemModelTester(view.model())
157+
proxy_tester = QAbstractItemModelTester(view.model())
176158
actions = QgsLayerTreeViewDefaultActions(view)
177159
self.assertEqual(self.project.layerTreeRoot().layerOrder(), [
178160
self.layer, self.layer2, self.layer3])
@@ -191,8 +173,7 @@ def testMoveToTopActionGroup(self):
191173
group.addLayer(self.layer5)
192174
groupname = group.name()
193175
view.setModel(self.model)
194-
if USE_MODEL_TESTER:
195-
proxy_tester = QAbstractItemModelTester(view.model())
176+
proxy_tester = QAbstractItemModelTester(view.model())
196177
actions = QgsLayerTreeViewDefaultActions(view)
197178
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
198179
self.layer.name(),
@@ -225,8 +206,7 @@ def testMoveToTopActionEmbeddedGroup(self):
225206
group.addLayer(self.layer5)
226207
groupname = group.name()
227208
view.setModel(self.model)
228-
if USE_MODEL_TESTER:
229-
proxy_tester = QAbstractItemModelTester(view.model())
209+
proxy_tester = QAbstractItemModelTester(view.model())
230210
actions = QgsLayerTreeViewDefaultActions(view)
231211
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
232212
self.layer.name(),
@@ -258,8 +238,7 @@ def testMoveToTopActionLayerAndGroup(self):
258238
group.addLayer(self.layer5)
259239
groupname = group.name()
260240
view.setModel(self.model)
261-
if USE_MODEL_TESTER:
262-
proxy_tester = QAbstractItemModelTester(view.model())
241+
proxy_tester = QAbstractItemModelTester(view.model())
263242
actions = QgsLayerTreeViewDefaultActions(view)
264243
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
265244
self.layer.name(),
@@ -292,8 +271,7 @@ def testMoveToBottomActionLayer(self):
292271

293272
view = QgsLayerTreeView()
294273
view.setModel(self.model)
295-
if USE_MODEL_TESTER:
296-
proxy_tester = QAbstractItemModelTester(view.model())
274+
proxy_tester = QAbstractItemModelTester(view.model())
297275
actions = QgsLayerTreeViewDefaultActions(view)
298276
self.assertEqual(self.project.layerTreeRoot().layerOrder(), [
299277
self.layer, self.layer2, self.layer3])
@@ -312,8 +290,7 @@ def testMoveToBottomActionGroup(self):
312290
group.addLayer(self.layer5)
313291
groupname = group.name()
314292
view.setModel(self.model)
315-
if USE_MODEL_TESTER:
316-
proxy_tester = QAbstractItemModelTester(view.model())
293+
proxy_tester = QAbstractItemModelTester(view.model())
317294
actions = QgsLayerTreeViewDefaultActions(view)
318295
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
319296
groupname,
@@ -346,8 +323,7 @@ def testMoveToBottomActionEmbeddedGroup(self):
346323
group.addLayer(self.layer5)
347324
groupname = group.name()
348325
view.setModel(self.model)
349-
if USE_MODEL_TESTER:
350-
proxy_tester = QAbstractItemModelTester(view.model())
326+
proxy_tester = QAbstractItemModelTester(view.model())
351327
actions = QgsLayerTreeViewDefaultActions(view)
352328
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
353329
self.layer.name(),
@@ -379,8 +355,7 @@ def testMoveToBottomActionLayerAndGroup(self):
379355
group.addLayer(self.layer5)
380356
groupname = group.name()
381357
view.setModel(self.model)
382-
if USE_MODEL_TESTER:
383-
proxy_tester = QAbstractItemModelTester(view.model())
358+
proxy_tester = QAbstractItemModelTester(view.model())
384359
actions = QgsLayerTreeViewDefaultActions(view)
385360
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
386361
groupname,
@@ -417,8 +392,7 @@ def testAddGroupActionLayer(self):
417392
group.addLayer(self.layer5)
418393
groupname = group.name()
419394
view.setModel(self.model)
420-
if USE_MODEL_TESTER:
421-
proxy_tester = QAbstractItemModelTester(view.model())
395+
proxy_tester = QAbstractItemModelTester(view.model())
422396
actions = QgsLayerTreeViewDefaultActions(view)
423397
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
424398
groupname,
@@ -452,8 +426,7 @@ def testAddGroupActionLayers(self):
452426
groupname = group.name()
453427

454428
view.setModel(self.model)
455-
if USE_MODEL_TESTER:
456-
proxy_tester = QAbstractItemModelTester(view.model())
429+
proxy_tester = QAbstractItemModelTester(view.model())
457430
actions = QgsLayerTreeViewDefaultActions(view)
458431
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
459432
groupname,
@@ -491,8 +464,7 @@ def testAddGroupActionGroup(self):
491464
group.addLayer(self.layer5)
492465
groupname = group.name()
493466
view.setModel(self.model)
494-
if USE_MODEL_TESTER:
495-
proxy_tester = QAbstractItemModelTester(view.model())
467+
proxy_tester = QAbstractItemModelTester(view.model())
496468
actions = QgsLayerTreeViewDefaultActions(view)
497469
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
498470
groupname,
@@ -529,8 +501,7 @@ def testAddGroupActionGroups(self):
529501
groupname2 = group2.name()
530502

531503
view.setModel(self.model)
532-
if USE_MODEL_TESTER:
533-
proxy_tester = QAbstractItemModelTester(view.model())
504+
proxy_tester = QAbstractItemModelTester(view.model())
534505
actions = QgsLayerTreeViewDefaultActions(view)
535506
self.assertEqual(self.nodeOrder(self.project.layerTreeRoot().children()), [
536507
groupname2,
@@ -567,8 +538,7 @@ def testSetLayerVisible(self):
567538

568539
view = QgsLayerTreeView()
569540
view.setModel(self.model)
570-
if USE_MODEL_TESTER:
571-
proxy_tester = QAbstractItemModelTester(view.model())
541+
proxy_tester = QAbstractItemModelTester(view.model())
572542
self.project.layerTreeRoot().findLayer(
573543
self.layer).setItemVisibilityChecked(True)
574544
self.project.layerTreeRoot().findLayer(
@@ -594,8 +564,7 @@ def testProxyModel(self):
594564

595565
view = QgsLayerTreeView()
596566
view.setModel(self.model)
597-
if USE_MODEL_TESTER:
598-
proxy_tester = QAbstractItemModelTester(view.model())
567+
proxy_tester = QAbstractItemModelTester(view.model())
599568
tree_model = view.layerTreeModel()
600569
proxy_model = view.proxyModel()
601570

@@ -660,9 +629,8 @@ def testProxyModelCurrentIndex(self):
660629

661630
view = QgsLayerTreeView()
662631
view.setModel(self.model)
663-
if USE_MODEL_TESTER:
664-
proxy_tester = QAbstractItemModelTester(view.model())
665-
tree_tester = QAbstractItemModelTester(view.layerTreeModel())
632+
proxy_tester = QAbstractItemModelTester(view.model())
633+
tree_tester = QAbstractItemModelTester(view.layerTreeModel())
666634

667635
view.setCurrentLayer(self.layer3)
668636
self.layer3.setFlags(self.layer.Private)
@@ -672,9 +640,8 @@ def testNode2IndexMethods(self):
672640

673641
view = QgsLayerTreeView()
674642
view.setModel(self.model)
675-
if USE_MODEL_TESTER:
676-
proxy_tester = QAbstractItemModelTester(view.model())
677-
tree_tester = QAbstractItemModelTester(view.layerTreeModel())
643+
proxy_tester = QAbstractItemModelTester(view.model())
644+
tree_tester = QAbstractItemModelTester(view.layerTreeModel())
678645

679646
tree_model = view.layerTreeModel()
680647
proxy_model = view.proxyModel()

‎tests/src/python/test_qgssymbollayer.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,9 @@
2323
__copyright__ = '(C) 2012, Massimo Endrighi'
2424

2525
import os
26-
from distutils.version import StrictVersion
2726

2827
import qgis # NOQA
2928
from osgeo import ogr
30-
from qgis.PyQt.Qt import PYQT_VERSION_STR
3129
from qgis.PyQt.QtCore import Qt, QObject, QDir, QFile, QIODevice, QPointF, QSize, QTemporaryDir
3230
from qgis.PyQt.QtGui import QColor, QImage, QPainter
3331
from qgis.PyQt.QtXml import QDomDocument
@@ -75,7 +73,6 @@
7573
QgsRendererCategory,
7674
)
7775
from qgis.testing import start_app, unittest
78-
7976
from utilities import unitTestDataPath
8077

8178
# Convenience instances in case you may need them
@@ -84,11 +81,7 @@
8481

8582
TEST_DATA_DIR = unitTestDataPath()
8683

87-
if StrictVersion(PYQT_VERSION_STR) < StrictVersion('5.7'):
88-
from qgis.PyQt.QtCore import pyqtWrapperType
89-
EXPECTED_TYPE = pyqtWrapperType
90-
else:
91-
EXPECTED_TYPE = type(QObject)
84+
EXPECTED_TYPE = type(QObject)
9285

9386

9487
class TestQgsSymbolLayer(unittest.TestCase):

0 commit comments

Comments
 (0)
Please sign in to comment.