feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

SquishTests: Remove compatibility code for Python 2

Browse Source 
Change-Id: Ibcf9a76fb163aa7167ad0ef0616c39b33c30d7c5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Löhning
2024-01-25 12:02:29 +01:00
parent 7bf7c4fbe3
commit 95df308bc3
8 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/system/shared/utils.py
View File

@@ -595,15 +595,12 @@ def getHelpTitle():
def isString(sth):
if sys.version_info.major > 2:
return isinstance(sth, str)
else:
return isinstance(sth, (str, unicode))
return isinstance(sth, str)
# helper function to ensure we get str, converts bytes if necessary
def stringify(obj):
stringTypes = (str, unicode) if sys.version_info.major == 2 else (str)
if isinstance(obj, stringTypes):
if isString(obj):
return obj
if isinstance(obj, bytes):
if not platform.system() in ('Microsoft', 'Windows'):