sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-18 00:03:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove python version checks

Browse Source
This commit is contained in:
Juergen E. Fischer 2017-03-03 17:40:13 +01:00
parent 324463489f
commit 96c31a1f0e
4 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/utils.py
View File

@ -643,7 +643,7 @@ _plugin_modules = {}
def _import(name, globals={}, locals={}, fromlist=[], level=None): def _import(name, globals={}, locals={}, fromlist=[], level=None):
""" wrapper around builtin import that keeps track of loaded plugin modules """ """ wrapper around builtin import that keeps track of loaded plugin modules """
if level is None: if level is None:
level = -1 if sys.version_info[0] < 3 else 0 level = 0
mod = _builtin_import(name, globals, locals, fromlist, level) mod = _builtin_import(name, globals, locals, fromlist, level)
if mod and '__file__' in mod.__dict__: if mod and '__file__' in mod.__dict__:

2
tests/src/python/test_qgsappstartup.py
View File

@ -119,8 +119,6 @@ class TestPyQgsAppStartup(unittest.TestCase):
for t in ['test_plugins', 'test plugins', 'test_pluginsé€']: for t in ['test_plugins', 'test plugins', 'test_pluginsé€']:
# get a unicode test dir # get a unicode test dir
if sys.version_info.major == 2:
t = t.encode(locale.getpreferredencoding())
testDir = os.path.join(self.TMP_DIR, t) testDir = os.path.join(self.TMP_DIR, t)
# copy from testdata # copy from testdata

6
tests/src/python/test_qgsdelimitedtextprovider.py
View File

@ -126,9 +126,6 @@ class MessageLogger(QObject):
def logMessage(self, msg, tag, level): def logMessage(self, msg, tag, level):
if tag == self.tag or not self.tag: if tag == self.tag or not self.tag:
if sys.version_info.major == 2:
self.log.append(str(msg))
else:
self.log.append(str(msg)) self.log.append(str(msg))
def messages(self): def messages(self):
@ -240,9 +237,6 @@ class TestQgsDelimitedTextProviderOther(unittest.TestCase):
for field in f.fields(): for field in f.fields():
fields.append(str(field.name())) fields.append(str(field.name()))
fieldTypes.append(str(field.typeName())) fieldTypes.append(str(field.typeName()))
if sys.version_info.major == 2:
fielddata = dict((name, str(f[name])) for name in fields)
else:
fielddata = dict((name, str(f[name])) for name in fields) fielddata = dict((name, str(f[name])) for name in fields)
g = f.geometry() g = f.geometry()
if not g.isNull(): if not g.isNull():

3
tests/src/python/test_qgsvirtuallayerdefinition.py
View File

@ -27,10 +27,7 @@ import sys
def strToUrl(s): def strToUrl(s):
if sys.version_info.major == 3:
return QUrl.fromEncoded(bytes(s, "utf8")) return QUrl.fromEncoded(bytes(s, "utf8"))
else:
return QUrl.fromEncoded(s)
class TestQgsVirtualLayerDefinition(unittest.TestCase): class TestQgsVirtualLayerDefinition(unittest.TestCase):