Skip to content

Commit 96c31a1

Browse files
committed
remove python version checks
1 parent 3244634 commit 96c31a1

File tree

4 files changed

+4
-15
lines changed

4 files changed

+4
-15
lines changed

python/utils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ def spatialite_connect(*args, **kwargs):
643643
def _import(name, globals={}, locals={}, fromlist=[], level=None):
644644
""" wrapper around builtin import that keeps track of loaded plugin modules """
645645
if level is None:
646-
level = -1 if sys.version_info[0] < 3 else 0
646+
level = 0
647647
mod = _builtin_import(name, globals, locals, fromlist, level)
648648

649649
if mod and '__file__' in mod.__dict__:

tests/src/python/test_qgsappstartup.py

-2
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,6 @@ def testPluginPath(self):
119119
for t in ['test_plugins', 'test plugins', 'test_pluginsé€']:
120120

121121
# get a unicode test dir
122-
if sys.version_info.major == 2:
123-
t = t.encode(locale.getpreferredencoding())
124122
testDir = os.path.join(self.TMP_DIR, t)
125123

126124
# copy from testdata

tests/src/python/test_qgsdelimitedtextprovider.py

+2-8
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,7 @@ def __exit__(self, type, value, traceback):
126126

127127
def logMessage(self, msg, tag, level):
128128
if tag == self.tag or not self.tag:
129-
if sys.version_info.major == 2:
130-
self.log.append(str(msg))
131-
else:
132-
self.log.append(str(msg))
129+
self.log.append(str(msg))
133130

134131
def messages(self):
135132
return self.log
@@ -240,10 +237,7 @@ def layerData(self, layer, request={}, offset=0):
240237
for field in f.fields():
241238
fields.append(str(field.name()))
242239
fieldTypes.append(str(field.typeName()))
243-
if sys.version_info.major == 2:
244-
fielddata = dict((name, str(f[name])) for name in fields)
245-
else:
246-
fielddata = dict((name, str(f[name])) for name in fields)
240+
fielddata = dict((name, str(f[name])) for name in fields)
247241
g = f.geometry()
248242
if not g.isNull():
249243
fielddata[geomkey] = str(g.exportToWkt())

tests/src/python/test_qgsvirtuallayerdefinition.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@
2727

2828

2929
def strToUrl(s):
30-
if sys.version_info.major == 3:
31-
return QUrl.fromEncoded(bytes(s, "utf8"))
32-
else:
33-
return QUrl.fromEncoded(s)
30+
return QUrl.fromEncoded(bytes(s, "utf8"))
3431

3532

3633
class TestQgsVirtualLayerDefinition(unittest.TestCase):

0 commit comments

Comments
 (0)