diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-04 08:27:14 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-04 08:27:14 +0100 |
commit | 98d9a82d4a94b91012c9e9cbc7f7c57ddacceac9 (patch) | |
tree | 10920682a82713a4579a94e51f54755707af805a /sources/pyside2/tests/util/py3xfunctions.py | |
parent | 7ef372b13fb6393b76029b9b62ebcb4166fa5f70 (diff) | |
parent | cc19c439a64ddc42bc333ee5df7b651a789d6da5 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I7a94c67fdb9225edf4d605e67839a1f6f7375c2a
Diffstat (limited to 'sources/pyside2/tests/util/py3xfunctions.py')
-rw-r--r-- | sources/pyside2/tests/util/py3xfunctions.py | 54 |
1 files changed, 0 insertions, 54 deletions
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_ |