Skip to content

Commit b719441

Browse files
3nids3nids
authored
Qt 5.7 dropped pyqtWrapperType (#6393)
version would need double check though
1 parent 713bfd3 commit b719441

File tree

1 file changed

+57
-73
lines changed

1 file changed

+57
-73
lines changed

‎tests/src/python/test_qgssymbollayer.py

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

2828
import os
2929

30-
from qgis.PyQt.QtCore import pyqtWrapperType, Qt, QDir, QFile, QIODevice, QPointF, QSize
30+
from distutils.version import StrictVersion
31+
from qgis.PyQt.Qt import PYQT_VERSION_STR
32+
from qgis.PyQt.QtCore import Qt, QObject, QDir, QFile, QIODevice, QPointF, QSize
3133
from qgis.PyQt.QtXml import QDomDocument
3234
from qgis.PyQt.QtGui import QColor, QImage, QPainter
3335

@@ -81,6 +83,12 @@
8183

8284
TEST_DATA_DIR = unitTestDataPath()
8385

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

8593
class TestQgsSymbolLayer(unittest.TestCase):
8694

@@ -107,193 +115,169 @@ def tearDown(self):
107115
def testBinding(self):
108116
"""Test python bindings existence."""
109117
mType = type(QgsSymbolLayer)
110-
mExpectedType = pyqtWrapperType
111-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
112-
assert mExpectedType == mType, mMessage
118+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
119+
assert EXPECTED_TYPE == mType, mMessage
113120

114121
try:
115122
mType = type(QgsFillSymbolLayer)
116123
except:
117124
mType = None
118-
mExpectedType = pyqtWrapperType
119-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
120-
assert mExpectedType == mType, mMessage
125+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
126+
assert EXPECTED_TYPE == mType, mMessage
121127

122128
try:
123129
mType = type(QgsGradientFillSymbolLayer)
124130
except:
125131
mType = None
126-
mExpectedType = pyqtWrapperType
127-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
128-
assert mExpectedType == mType, mMessage
132+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
133+
assert EXPECTED_TYPE == mType, mMessage
129134

130135
try:
131136
mType = type(QgsLinePatternFillSymbolLayer)
132137
except:
133138
mType = None
134-
mExpectedType = pyqtWrapperType
135-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
136-
assert mExpectedType == mType, mMessage
139+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
140+
assert EXPECTED_TYPE == mType, mMessage
137141

138142
try:
139143
mType = type(QgsPointPatternFillSymbolLayer)
140144
except:
141145
mType = None
142-
mExpectedType = pyqtWrapperType
143-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
144-
assert mExpectedType == mType, mMessage
146+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
147+
assert EXPECTED_TYPE == mType, mMessage
145148

146149
try:
147150
mType = type(QgsImageFillSymbolLayer)
148151
except:
149152
mType = None
150-
mExpectedType = pyqtWrapperType
151-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
152-
assert mExpectedType == mType, mMessage
153+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
154+
assert EXPECTED_TYPE == mType, mMessage
153155

154156
try:
155157
mType = type(QgsPointPatternFillSymbolLayer)
156158
except:
157159
mType = None
158-
mExpectedType = pyqtWrapperType
159-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
160-
assert mExpectedType == mType, mMessage
160+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
161+
assert EXPECTED_TYPE == mType, mMessage
161162

162163
try:
163164
mType = type(QgsGradientFillSymbolLayer)
164165
except:
165166
mType = None
166-
mExpectedType = pyqtWrapperType
167-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
168-
assert mExpectedType == mType, mMessage
167+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
168+
assert EXPECTED_TYPE == mType, mMessage
169169

170170
try:
171171
mType = type(QgsShapeburstFillSymbolLayer)
172172
except:
173173
mType = None
174-
mExpectedType = pyqtWrapperType
175-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
176-
assert mExpectedType == mType, mMessage
174+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
175+
assert EXPECTED_TYPE == mType, mMessage
177176

178177
try:
179178
mType = type(QgsSVGFillSymbolLayer)
180179
except:
181180
mType = None
182-
mExpectedType = pyqtWrapperType
183-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
184-
assert mExpectedType == mType, mMessage
181+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
182+
assert EXPECTED_TYPE == mType, mMessage
185183

186184
try:
187185
mType = type(QgsCentroidFillSymbolLayer)
188186
except:
189187
mType = None
190-
mExpectedType = pyqtWrapperType
191-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
192-
assert mExpectedType == mType, mMessage
188+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
189+
assert EXPECTED_TYPE == mType, mMessage
193190

194191
try:
195192
mType = type(QgsRasterFillSymbolLayer)
196193
except:
197194
mType = None
198-
mExpectedType = pyqtWrapperType
199-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
200-
assert mExpectedType == mType, mMessage
195+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
196+
assert EXPECTED_TYPE == mType, mMessage
201197

202198
try:
203199
mType = type(QgsSimpleFillSymbolLayer)
204200
except:
205201
mType = None
206-
mExpectedType = pyqtWrapperType
207-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
208-
assert mExpectedType == mType, mMessage
202+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
203+
assert EXPECTED_TYPE == mType, mMessage
209204

210205
try:
211206
mType = type(QgsLineSymbolLayer)
212207
except:
213208
mType = None
214-
mExpectedType = pyqtWrapperType
215-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
216-
assert mExpectedType == mType, mMessage
209+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
210+
assert EXPECTED_TYPE == mType, mMessage
217211

218212
try:
219213
mType = type(QgsMarkerLineSymbolLayer)
220214
except:
221215
mType = None
222-
mExpectedType = pyqtWrapperType
223-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
224-
assert mExpectedType == mType, mMessage
216+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
217+
assert EXPECTED_TYPE == mType, mMessage
225218

226219
try:
227220
mType = type(QgsArrowSymbolLayer)
228221
except:
229222
mType = None
230-
mExpectedType = pyqtWrapperType
231-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
232-
assert mExpectedType == mType, mMessage
223+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
224+
assert EXPECTED_TYPE == mType, mMessage
233225

234226
try:
235227
mType = type(QgsSimpleLineSymbolLayer)
236228
except:
237229
mType = None
238-
mExpectedType = pyqtWrapperType
239-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
240-
assert mExpectedType == mType, mMessage
230+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
231+
assert EXPECTED_TYPE == mType, mMessage
241232

242233
try:
243234
mType = type(QgsMarkerSymbolLayer)
244235
except:
245236
mType = None
246-
mExpectedType = pyqtWrapperType
247-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
248-
assert mExpectedType == mType, mMessage
237+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
238+
assert EXPECTED_TYPE == mType, mMessage
249239

250240
try:
251241
mType = type(QgsEllipseSymbolLayer)
252242
except:
253243
mType = None
254-
mExpectedType = pyqtWrapperType
255-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
256-
assert mExpectedType == mType, mMessage
244+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
245+
assert EXPECTED_TYPE == mType, mMessage
257246

258247
try:
259248
mType = type(QgsFontMarkerSymbolLayer)
260249
except:
261250
mType = None
262-
mExpectedType = pyqtWrapperType
263-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
264-
assert mExpectedType == mType, mMessage
251+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
252+
assert EXPECTED_TYPE == mType, mMessage
265253

266254
try:
267255
mType = type(QgsSimpleMarkerSymbolLayer)
268256
except:
269257
mType = None
270-
mExpectedType = pyqtWrapperType
271-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
272-
assert mExpectedType == mType, mMessage
258+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
259+
assert EXPECTED_TYPE == mType, mMessage
273260

274261
try:
275262
mType = type(QgsFilledMarkerSymbolLayer)
276263
except:
277264
mType = None
278-
mExpectedType = pyqtWrapperType
279-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
280-
assert mExpectedType == mType, mMessage
265+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
266+
assert EXPECTED_TYPE == mType, mMessage
281267

282268
try:
283269
mType = type(QgsSvgMarkerSymbolLayer)
284270
except:
285271
mType = None
286-
mExpectedType = pyqtWrapperType
287-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
288-
assert mExpectedType == mType, mMessage
272+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
273+
assert EXPECTED_TYPE == mType, mMessage
289274

290275
try:
291276
mType = type(QgsVectorFieldSymbolLayer)
292277
except:
293278
mType = None
294-
mExpectedType = pyqtWrapperType
295-
mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
296-
assert mExpectedType == mType, mMessage
279+
mMessage = 'Expected "%s" got "%s"' % (EXPECTED_TYPE, mType)
280+
assert EXPECTED_TYPE == mType, mMessage
297281

298282
def testGettersSetters(self):
299283
""" test base class getters/setters """

0 commit comments

Comments
 (0)