diff --git a/qt/aqt/qt/__init__.py b/qt/aqt/qt/__init__.py index 767415d60..52d854605 100644 --- a/qt/aqt/qt/__init__.py +++ b/qt/aqt/qt/__init__.py @@ -13,7 +13,7 @@ try: if not os.getenv("DISABLE_QT5_COMPAT"): print("Running with temporary Qt5 compatibility shims.") print("Run with DISABLE_QT5_COMPAT=1 to confirm compatibility with Qt6.") - from . import compat # needs to be imported first + from . import qt5_compat # needs to be imported first from .qt6 import * except: from .qt5 import * # type: ignore diff --git a/qt/aqt/qt/qt5extra.py b/qt/aqt/qt/qt5_audio.py similarity index 99% rename from qt/aqt/qt/qt5extra.py rename to qt/aqt/qt/qt5_audio.py index 4db0569d2..ffab7477e 100644 --- a/qt/aqt/qt/qt5extra.py +++ b/qt/aqt/qt/qt5_audio.py @@ -4,7 +4,7 @@ # pylint: skip-file """ -PyQt5-only code +PyQt5-only audio code """ import wave diff --git a/qt/aqt/qt/compat.py b/qt/aqt/qt/qt5_compat.py similarity index 99% rename from qt/aqt/qt/compat.py rename to qt/aqt/qt/qt5_compat.py index 9a7759a0f..04484cdfe 100644 --- a/qt/aqt/qt/compat.py +++ b/qt/aqt/qt/qt5_compat.py @@ -401,6 +401,6 @@ for module, type_to_enum_list in _enum_map: # Mock the removed PyQt5.Qt module ########################################################################## -from . import qt5qt +from . import qt5_qt_module -sys.modules["PyQt5.Qt"] = qt5qt +sys.modules["PyQt5.Qt"] = qt5_qt_module diff --git a/qt/aqt/qt/qt5qt.py b/qt/aqt/qt/qt5_qt_module.py similarity index 100% rename from qt/aqt/qt/qt5qt.py rename to qt/aqt/qt/qt5_qt_module.py diff --git a/qt/aqt/sound.py b/qt/aqt/sound.py index c683144e0..b3cce2ea3 100644 --- a/qt/aqt/sound.py +++ b/qt/aqt/sound.py @@ -671,7 +671,7 @@ class RecordDialog(QDialog): namedtmp("rec.wav"), self.mw, self._parent ) else: - from aqt.qt.qt5extra import QtAudioInputRecorder as Qt5Recorder + from aqt.qt.qt5_audio import QtAudioInputRecorder as Qt5Recorder self._recorder = Qt5Recorder(namedtmp("rec.wav"), self.mw, self._parent) self._recorder.start(self._start_timer)