From d617dc6869bcd5afcd784ff39cc5b6597b1912a2 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 9 Apr 2024 09:50:13 -0700 Subject: [PATCH] modules: rename qt.py -> _qt.py Since it's an implementation detail, and shouldn't be exposed. This also helps give better error messages when a user writes `import('qt')`, since otherwise you get an error about `qt doesn't have an initialize method`, and now you get `qt module doesn't exist`. --- mesonbuild/modules/{qt.py => _qt.py} | 0 mesonbuild/modules/qt4.py | 2 +- mesonbuild/modules/qt5.py | 2 +- mesonbuild/modules/qt6.py | 2 +- run_mypy.py | 2 +- unittests/datatests.py | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename mesonbuild/modules/{qt.py => _qt.py} (100%) diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/_qt.py similarity index 100% rename from mesonbuild/modules/qt.py rename to mesonbuild/modules/_qt.py diff --git a/mesonbuild/modules/qt4.py b/mesonbuild/modules/qt4.py index 354b4a5cf..47eb00778 100644 --- a/mesonbuild/modules/qt4.py +++ b/mesonbuild/modules/qt4.py @@ -4,7 +4,7 @@ from __future__ import annotations import typing as T -from .qt import QtBaseModule +from ._qt import QtBaseModule from . import ModuleInfo if T.TYPE_CHECKING: diff --git a/mesonbuild/modules/qt5.py b/mesonbuild/modules/qt5.py index 11958c981..f950c0944 100644 --- a/mesonbuild/modules/qt5.py +++ b/mesonbuild/modules/qt5.py @@ -4,7 +4,7 @@ from __future__ import annotations import typing as T -from .qt import QtBaseModule +from ._qt import QtBaseModule from . import ModuleInfo if T.TYPE_CHECKING: diff --git a/mesonbuild/modules/qt6.py b/mesonbuild/modules/qt6.py index b23204678..bf23305d6 100644 --- a/mesonbuild/modules/qt6.py +++ b/mesonbuild/modules/qt6.py @@ -4,7 +4,7 @@ from __future__ import annotations import typing as T -from .qt import QtBaseModule +from ._qt import QtBaseModule from . import ModuleInfo if T.TYPE_CHECKING: diff --git a/run_mypy.py b/run_mypy.py index f1976226b..35a90e8e9 100755 --- a/run_mypy.py +++ b/run_mypy.py @@ -62,7 +62,7 @@ modules = [ 'mesonbuild/modules/keyval.py', 'mesonbuild/modules/modtest.py', 'mesonbuild/modules/pkgconfig.py', - 'mesonbuild/modules/qt.py', + 'mesonbuild/modules/_qt.py', 'mesonbuild/modules/qt4.py', 'mesonbuild/modules/qt5.py', 'mesonbuild/modules/qt6.py', diff --git a/unittests/datatests.py b/unittests/datatests.py index 4f9d52032..b14bbac5a 100644 --- a/unittests/datatests.py +++ b/unittests/datatests.py @@ -201,7 +201,7 @@ class DataTests(unittest.TestCase): html = f.read().lower() self.assertIsNotNone(html) for f in Path('mesonbuild/modules').glob('*.py'): - if f.name in {'modtest.py', 'qt.py', '__init__.py'}: + if f.name.startswith('_') or f.name == 'modtest.py': continue name = f'{f.stem}-module.html' name = name.replace('unstable_', '')