tests: remove old files and rewrite python 2

Some utilities from the tests directory were still around,
and are not currently used.
Additionally, there were still some old non active tests with
Python 2 directives; updating them in case we reactivated them.

Change-Id: I24aff3396041aa780dab94e70793cb62adea2b3c
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit aeed3d2ec76a74ba98441338c235ecc02281e347)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

17 files changed, 1 insertions, 110 deletions

diff --git a/sources/pyside6/tests/QtWidgets/bug_711.py b/sources/pyside6/tests/QtWidgets/bug_711.py
index bf6516a0a..9ed49019e 100644
--- a/sources/pyside6/tests/QtWidgets/bug_711.py
+++ b/sources/pyside6/tests/QtWidgets/bug_711.py
@@ -37,16 +37,11 @@ init_test_paths(False)
 from PySide6.QtGui import QAction
 from PySide6.QtWidgets import QToolBar, QApplication, QToolButton
 
-try:
-    xrange
-except NameError:
-    xrange = range # py3k
-
 class TestLabelPixmap(unittest.TestCase):
     def testReference(self):
         toolbar = QToolBar()
 
-        for i in xrange(20):
+        for i in range(20):
             toolbar.addAction(QAction("Action %d" % i, None))
 
         buttons = toolbar.findChildren(QToolButton, "")
diff --git a/sources/pyside6/tests/util/module_wrapper/PySide/QtAssistant.py b/sources/pyside6/tests/util/module_wrapper/PySide/QtAssistant.py
deleted file mode 100644
index d0975d51e..000000000
--- a/sources/pyside6/tests/util/module_wrapper/PySide/QtAssistant.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from PyQt4.QtAssistant import *
diff --git a/sources/pyside6/tests/util/module_wrapper/PySide/QtCore.py b/sources/pyside6/tests/util/module_wrapper/PySide/QtCore.py
deleted file mode 100644
index a6a225649..000000000
--- a/sources/pyside6/tests/util/module_wrapper/PySide/QtCore.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from PyQt4.QtCore import *
diff --git a/sources/pyside6/tests/util/module_wrapper/PySide/QtDesigner.py b/sources/pyside6/tests/util/module_wrapper/PySide/QtDesigner.py
deleted file mode 100644
index 5cf9d5f6d..000000000
--- a/sources/pyside6/tests/util/module_wrapper/PySide/QtDesigner.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from PyQt4.QtDesigner import *
diff --git a/sources/pyside6/tests/util/module_wrapper/PySide/QtGui.py b/sources/pyside6/tests/util/module_wrapper/PySide/QtGui.py
deleted file mode 100644
index 0b8b4e957..000000000
--- a/sources/pyside6/tests/util/module_wrapper/PySide/QtGui.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from PyQt4.QtGui import *
diff --git a/sources/pyside6/tests/util/module_wrapper/PySide/QtHelp.py b/sources/pyside6/tests/util/module_wrapper/PySide/QtHelp.py
deleted file mode 100644
index dd3fd6cd8..000000000
--- a/sources/pyside6/tests/util/module_wrapper/PySide/QtHelp.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from PyQt4.QtHelp import *
diff --git a/sources/pyside6/tests/util/module_wrapper/PySide/QtNetwork.py b/sources/pyside6/tests/util/module_wrapper/PySide/QtNetwork.py
deleted file mode 100644
index 1a669a421..000000000
--- a/sources/pyside6/tests/util/module_wrapper/PySide/QtNetwork.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from PyQt4.QtNetwork import *
diff --git a/sources/pyside6/tests/util/module_wrapper/PySide/QtScript.py b/sources/pyside6/tests/util/module_wrapper/PySide/QtScript.py
deleted file mode 100644
index 4f6b30e8e..000000000
--- a/sources/pyside6/tests/util/module_wrapper/PySide/QtScript.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from PyQt4.QtScript import *
diff --git a/sources/pyside6/tests/util/module_wrapper/PySide/QtSql.py b/sources/pyside6/tests/util/module_wrapper/PySide/QtSql.py
deleted file mode 100644
index 35dd0a106..000000000
--- a/sources/pyside6/tests/util/module_wrapper/PySide/QtSql.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from PyQt4.QtSql import *
diff --git a/sources/pyside6/tests/util/module_wrapper/PySide/QtSvg.py b/sources/pyside6/tests/util/module_wrapper/PySide/QtSvg.py
deleted file mode 100644
index f308222b9..000000000
--- a/sources/pyside6/tests/util/module_wrapper/PySide/QtSvg.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from PyQt4.QtSvg import *
diff --git a/sources/pyside6/tests/util/module_wrapper/PySide/QtTest.py b/sources/pyside6/tests/util/module_wrapper/PySide/QtTest.py
deleted file mode 100644
index 95f64006b..000000000
--- a/sources/pyside6/tests/util/module_wrapper/PySide/QtTest.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from PyQt4.QtTest import *
diff --git a/sources/pyside6/tests/util/module_wrapper/PySide/QtXml.py b/sources/pyside6/tests/util/module_wrapper/PySide/QtXml.py
deleted file mode 100644
index 2888a4e49..000000000
--- a/sources/pyside6/tests/util/module_wrapper/PySide/QtXml.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from PyQt4.QtXml import *
diff --git a/sources/pyside6/tests/util/module_wrapper/PySide/QtXmlPatterns.py b/sources/pyside6/tests/util/module_wrapper/PySide/QtXmlPatterns.py
deleted file mode 100644
index 6de76d830..000000000
--- a/sources/pyside6/tests/util/module_wrapper/PySide/QtXmlPatterns.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from PyQt4.QtXmlPatterns import *
diff --git a/sources/pyside6/tests/util/module_wrapper/PySide/__init__.py b/sources/pyside6/tests/util/module_wrapper/PySide/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/sources/pyside6/tests/util/module_wrapper/PySide/__init__.py
+++ /dev/null
diff --git a/sources/pyside6/tests/util/pyqtcheck.py b/sources/pyside6/tests/util/pyqtcheck.py
deleted file mode 100644
index 6bac533ce..000000000
--- a/sources/pyside6/tests/util/pyqtcheck.py
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env python
-
-#############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the test suite of Qt for Python.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-import sys
-from optparse import OptionParser
-
-import PyQt4
-from PyQt4 import QtCore, QtGui, QtNetwork
-
-modules = [QtCore, QtGui, QtNetwork]
-
-def search(klass, method=None):
-    for module in modules:
-        try:
-            klass_obj = getattr(module, klass)
-            print("%s *found* on module %s" % (klass, module.__name__))
-        except AttributeError:
-            print("%s not found on module %s" % (klass, module.__name__))
-            continue
-
-        if method is None:
-            continue
-
-        try:
-            meth_obj = getattr(klass_obj, method)
-
-            meth_name = ".".join([klass, method])
-            klass_name = ".".join([module.__name__, klass])
-            print("\"%s\" *found* on class %s" % (meth_name, klass_name))
-        except AttributeError:
-            print("\"%s\" not found on class %s" % (method, klass))
-
-
-def main(argv=None):
-    if argv is None:
-        argv = sys.argv[1:]
-
-    try:
-        klass, method = argv[0].split(".")
-    except:
-        klass = argv[0]
-        method = None
-
-    search(klass, method)
-
-if __name__ == '__main__':
-    main()
diff --git a/sources/pyside6/tests/util/use_pyqt4.sh b/sources/pyside6/tests/util/use_pyqt4.sh
deleted file mode 100644
index 5b88fa5c7..000000000
--- a/sources/pyside6/tests/util/use_pyqt4.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-
-OLD_PYTHONPATH=$PYTHONPATH
-PYTHONPATH=`pwd`/util/module_wrapper:$PYTHONPATH
diff --git a/sources/pyside6/tests/util/use_pyside.sh b/sources/pyside6/tests/util/use_pyside.sh
deleted file mode 100644
index 516207473..000000000
--- a/sources/pyside6/tests/util/use_pyside.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PYTHONPATH=$OLD_PYTHONPATH
-unset OLD_PYTHONPATH