aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2024-04-09 09:50:13 -0700
committerDylan Baker <dylan@pnwbakers.com>2024-04-09 12:27:39 -0700
commitd617dc6869bcd5afcd784ff39cc5b6597b1912a2 (patch)
tree852289f5450f09b62fe362729d45bec5969e2444
parentef2b164f1f6b6597b48ea34ef897f6a303499620 (diff)
downloadmeson-d617dc6869bcd5afcd784ff39cc5b6597b1912a2.zip
meson-d617dc6869bcd5afcd784ff39cc5b6597b1912a2.tar.gz
meson-d617dc6869bcd5afcd784ff39cc5b6597b1912a2.tar.bz2
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`.
-rw-r--r--mesonbuild/modules/_qt.py (renamed from mesonbuild/modules/qt.py)0
-rw-r--r--mesonbuild/modules/qt4.py2
-rw-r--r--mesonbuild/modules/qt5.py2
-rw-r--r--mesonbuild/modules/qt6.py2
-rwxr-xr-xrun_mypy.py2
-rw-r--r--unittests/datatests.py2
6 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/_qt.py
index 7effa1f..7effa1f 100644
--- a/mesonbuild/modules/qt.py
+++ b/mesonbuild/modules/_qt.py
diff --git a/mesonbuild/modules/qt4.py b/mesonbuild/modules/qt4.py
index 354b4a5..47eb007 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 11958c9..f950c09 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 b232046..bf23305 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 f197622..35a90e8 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 4f9d520..b14bbac 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_', '')