diff options
Diffstat (limited to 'sources/pyside6/tests/registry/util.py')
| -rw-r--r-- | sources/pyside6/tests/registry/util.py | 52 |
1 files changed, 4 insertions, 48 deletions
diff --git a/sources/pyside6/tests/registry/util.py b/sources/pyside6/tests/registry/util.py index 4a4b2fd01..5d81926a1 100644 --- a/sources/pyside6/tests/registry/util.py +++ b/sources/pyside6/tests/registry/util.py @@ -1,41 +1,5 @@ -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of Qt for Python. -## -## $QT_BEGIN_LICENSE:LGPL$ -## 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 Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 3 as published by the Free Software -## Foundation and appearing in the file LICENSE.LGPL3 included in the -## packaging of this file. Please review the following information to -## ensure the GNU Lesser General Public License version 3 requirements -## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 2.0 or (at your option) the GNU General -## Public license version 3 or any later version approved by the KDE Free -## Qt Foundation. The licenses are as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -## 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-2.0.html and -## https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################# +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only """ Supporting isolation of warnings @@ -62,8 +26,6 @@ def isolate_warnings(): if mod and hasattr(mod, warn_name): save_warnings[name] = mod.__dict__[warn_name] delattr(mod, warn_name) - else: - save_warnings[name] = None yield for name, warn in save_warnings.items(): mod = sys.modules[name] @@ -109,14 +71,8 @@ def linux_distribution(): # distro package, ASAP! The distro has been extracted from Python, # because it changes more often than the Python version. distribution = [] - try: - import distro - distribution = distro.linux_distribution() - except ImportError: - # platform.linux_distribution() was removed in 3.8 - if sys.version_info[:2] < (3, 8): - import platform - distribution = platform.linux_distribution() + import distro + distribution = distro.linux_distribution() if distribution: return "".join(distribution[:2]).lower() warnings.warn('Cannot determine Linux distribution, please install distro', |