Unify the py3kcompat.py test helpers

Put everything into a single file and mark them as copies.

Change-Id: I782247520d6976695a14f762e8247e5c4eb46aac
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

4 files changed, 80 insertions, 108 deletions

diff --git a/sources/pyside2/tests/util/py2xfunctions.py b/sources/pyside2/tests/util/py2xfunctions.py
deleted file mode 100644
index 11bc6826b..000000000
--- a/sources/pyside2/tests/util/py2xfunctions.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#############################################################################
-##
-## 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$
-##
-#############################################################################
-
-def b(s):
-    return s
-
-def l(n):
-    return long(n)
-
-def unicode_(s):
-    if type(s) == str:
-        import codecs
-        c = codecs.lookup('utf-8')
-        s2 = c.decode(s, 'ignore')
-        return s2[0]
-    return u'%s' % s
-
-unicode = unicode
-unichr = unichr
-long = long
-buffer = buffer
diff --git a/sources/pyside2/tests/util/py3kcompat.py b/sources/pyside2/tests/util/py3kcompat.py
index b58181fff..bd90973ec 100644
--- a/sources/pyside2/tests/util/py3kcompat.py
+++ b/sources/pyside2/tests/util/py3kcompat.py
@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
+
 #############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the test suite of Qt for Python.
@@ -27,12 +28,55 @@
 ##
 #############################################################################
 
+# Copy of ../../../shiboken2/tests/py3kcompat.py
+
 import sys
 
 IS_PY3K = sys.version_info[0] == 3
 
 if IS_PY3K:
-    from py3xfunctions import b, l, unicode_, unicode, unichr, long, unichr, buffer
+    def b(s):
+        if type(s) == bytes:
+            return s
+        return bytes(s, "UTF8")
+
+    def buffer_(s):
+        if s == None:
+            return None
+        elif type(s) == str:
+            return bytes(s, "UTF8")
+        elif type(s) == bytes:
+            return s
+        else:
+            memoryview(s)
+
+    def l(n):
+        return n
+
+    def unicode_(s):
+        return s
+
+    unicode = str
+    unichr = chr
+    long = int
+    unichr = chr
+    buffer = buffer_
 else:
-    from py2xfunctions import b, l, unicode_, unicode, unichr, long, unichr, buffer
+    def b(s):
+        return s
+
+    def l(n):
+        return long(n)
+
+    def unicode_(s):
+        if type(s) == str:
+            import codecs
+            c = codecs.lookup('utf-8')
+            s2 = c.decode(s, 'ignore')
+            return s2[0]
+        return u'%s' % s
 
+    unicode = unicode
+    unichr = unichr
+    long = long
+    buffer = buffer
diff --git a/sources/pyside2/tests/util/py3xfunctions.py b/sources/pyside2/tests/util/py3xfunctions.py
deleted file mode 100644
index 2d84c4721..000000000
--- a/sources/pyside2/tests/util/py3xfunctions.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#############################################################################
-##
-## 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$
-##
-#############################################################################
-
-def b(s):
-    if type(s) == bytes:
-        return s
-    return bytes(s, "UTF8")
-
-def buffer_(s):
-    if s == None:
-        return None
-    elif type(s) == str:
-        return bytes(s, "UTF8")
-    elif type(s) == bytes:
-        return s
-    else:
-        memoryview(s)
-
-def l(n):
-    return n
-
-def unicode_(s):
-    return s
-
-unicode = str
-unichr = chr
-long = int
-unichr = chr
-buffer = buffer_
diff --git a/sources/shiboken2/tests/py3kcompat.py b/sources/shiboken2/tests/py3kcompat.py
index 065208994..357ea4fba 100644
--- a/sources/shiboken2/tests/py3kcompat.py
+++ b/sources/shiboken2/tests/py3kcompat.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-#
+
 #############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the test suite of Qt for Python.
@@ -28,21 +28,39 @@
 ##
 #############################################################################
 
+# Copy of ../../pyside2/tests/util/py3kcompat.py
+
 import sys
 
 IS_PY3K = sys.version_info[0] == 3
 
 if IS_PY3K:
-    def unicode(s):
-        return s
-
     def b(s):
+        if type(s) == bytes:
+            return s
         return bytes(s, "UTF8")
 
+    def buffer_(s):
+        if s == None:
+            return None
+        elif type(s) == str:
+            return bytes(s, "UTF8")
+        elif type(s) == bytes:
+            return s
+        else:
+            memoryview(s)
+
     def l(n):
         return n
 
+    def unicode_(s):
+        return s
+
+    unicode = str
+    unichr = chr
     long = int
+    unichr = chr
+    buffer = buffer_
 else:
     def b(s):
         return s
@@ -50,5 +68,15 @@ else:
     def l(n):
         return long(n)
 
+    def unicode_(s):
+        if type(s) == str:
+            import codecs
+            c = codecs.lookup('utf-8')
+            s2 = c.decode(s, 'ignore')
+            return s2[0]
+        return u'%s' % s
+
     unicode = unicode
+    unichr = unichr
     long = long
+    buffer = buffer