diff options
| author | Cristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2020-10-27 20:12:12 +0100 |
|---|---|---|
| committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2020-10-28 13:56:40 +0000 |
| commit | 1fceed1fc3565080eef556c9b71498780aa94bf2 (patch) | |
| tree | 848628ec5561e8c90d19cf3996f1047d39ab7928 /examples/utils | |
| parent | 1bc8c8ce262d80bbea0141f48055342adca9e3f9 (diff) | |
examples: Remove Python 2.7 and <3.6 related code
* removing from __future__ import ...
* updating CMakeLists.txt files
* removing special if-else for Python 2 and 3
Change-Id: I8a34b06b6b384ebc5323f20f7c15c357a5be6d62
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'examples/utils')
| -rw-r--r-- | examples/utils/pyside2_config.py | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/examples/utils/pyside2_config.py b/examples/utils/pyside2_config.py index f759b11e5..135be79d4 100644 --- a/examples/utils/pyside2_config.py +++ b/examples/utils/pyside2_config.py @@ -148,15 +148,8 @@ def shared_library_suffix(): def import_suffixes(): - if (sys.version_info >= (3, 4)): - import importlib.machinery - return importlib.machinery.EXTENSION_SUFFIXES - else: - import imp - result = [] - for t in imp.get_suffixes(): - result.append(t[0]) - return result + import importlib.machinery + return importlib.machinery.EXTENSION_SUFFIXES def is_debug(): @@ -228,7 +221,7 @@ def find_package_path(dir_name): return None -# Return version as "3.5" +# Return version as "3.6" def python_version(): return str(sys.version_info[0]) + '.' + str(sys.version_info[1]) @@ -283,11 +276,7 @@ def python_link_data(): # Linux and anything else else: - if sys.version_info[0] < 3: - suffix = '_d' if is_debug() else '' - flags['lib'] = 'python{}{}'.format(version, suffix) - else: - flags['lib'] = 'python{}{}'.format(version, sys.abiflags) + flags['lib'] = 'python{}{}'.format(version, sys.abiflags) return flags |