@@ -169,17 +169,15 @@ def splitVersion(s):
169
169
return l
170
170
171
171
172
- def isCompatible (curVer , minVer , maxVer = None ):
172
+ def isCompatible (curVer , minVer , maxVer ):
173
173
""" Compare current QGIS version with qgisMinVersion and qgisMaxVersion """
174
- minVer = splitVersion ( re .sub (r'[^0-9.]+' , '' , minVer ) )
175
- maxVer = splitVersion ( re .sub (r'[^0-9.]+' , '' , maxVer ) )
176
- curVer = splitVersion ( re .sub (r'[^0-9.]+' , '' , curVer ) )
177
174
178
- if not minVer or not curVer :
175
+ if not minVer or not curVer or not maxVer :
179
176
return False
180
177
181
- if not maxVer :
182
- maxVer = [minVer [0 ], "99" , "99" ]
178
+ minVer = splitVersion ( re .sub (r'[^0-9.]+' , '' , minVer ) )
179
+ maxVer = splitVersion ( re .sub (r'[^0-9.]+' , '' , maxVer ) )
180
+ curVer = splitVersion ( re .sub (r'[^0-9.]+' , '' , curVer ) )
183
181
184
182
if len (minVer )< 3 :
185
183
minVer += ["0" ]
@@ -190,8 +188,8 @@ def isCompatible(curVer, minVer, maxVer=None):
190
188
if len (maxVer )< 3 :
191
189
maxVer += ["99" ]
192
190
193
- minVer = "%02d%02d%02d " % ( int (minVer [0 ]), int (minVer [1 ]), int (minVer [2 ]) )
194
- maxVer = "%02d%02d%02d " % ( int (maxVer [0 ]), int (maxVer [1 ]), int (maxVer [2 ]) )
195
- curVer = "%02d%02d%02d " % ( int (curVer [0 ]), int (curVer [1 ]), int (curVer [2 ]) )
191
+ minVer = "%04d%04d%04d " % ( int (minVer [0 ]), int (minVer [1 ]), int (minVer [2 ]) )
192
+ maxVer = "%04d%04d%04d " % ( int (maxVer [0 ]), int (maxVer [1 ]), int (maxVer [2 ]) )
193
+ curVer = "%04d%04d%04d " % ( int (curVer [0 ]), int (curVer [1 ]), int (curVer [2 ]) )
196
194
197
195
return ( minVer <= curVer and maxVer >= curVer )
0 commit comments