diff options
| -rw-r--r-- | meson/interpreter.py | 2 | ||||
| -rw-r--r-- | meson/modules/gnome.py | 8 | ||||
| -rw-r--r-- | meson/modules/pkgconfig.py | 4 | ||||
| -rw-r--r-- | meson/modules/qt4.py | 6 | ||||
| -rw-r--r-- | meson/modules/qt5.py | 6 | ||||
| -rw-r--r-- | meson/modules/rpm.py | 10 | ||||
| -rw-r--r-- | meson/modules/windows.py | 4 | ||||
| -rwxr-xr-x | scripts/symbolextractor.py | 2 |
8 files changed, 21 insertions, 21 deletions
diff --git a/meson/interpreter.py b/meson/interpreter.py index ec1bda0..5ce2f8d 100644 --- a/meson/interpreter.py +++ b/meson/interpreter.py @@ -1094,7 +1094,7 @@ class Interpreter(): raise InvalidCode('Import takes one argument.') modname = args[0] if not modname in self.environment.coredata.modules: - module = importlib.import_module('modules.' + modname).initialize() + module = importlib.import_module('meson.modules.' + modname).initialize() self.environment.coredata.modules[modname] = module return ModuleHolder(modname, self.environment.coredata.modules[modname], self) diff --git a/meson/modules/gnome.py b/meson/modules/gnome.py index 60c994e..70ac81b 100644 --- a/meson/modules/gnome.py +++ b/meson/modules/gnome.py @@ -15,13 +15,13 @@ '''This module provides helper functions for Gnome/GLib related functionality such as gobject-introspection and gresources.''' -import build +from .. import build import os, sys import subprocess -from coredata import MesonException -import mlog +from ..coredata import MesonException +from .. import mlog import xml.etree.ElementTree as ET -from mesonlib import File +from ..mesonlib import File girwarning_printed = False diff --git a/meson/modules/pkgconfig.py b/meson/modules/pkgconfig.py index 5fa4bd0..f18decf 100644 --- a/meson/modules/pkgconfig.py +++ b/meson/modules/pkgconfig.py @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import coredata, build -import mesonlib +from .. import coredata, build +from .. import mesonlib import os class PkgConfigModule: diff --git a/meson/modules/qt4.py b/meson/modules/qt4.py index bcf42a3..162b553 100644 --- a/meson/modules/qt4.py +++ b/meson/modules/qt4.py @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import dependencies, mlog +from .. import dependencies, mlog import os, subprocess -import build -from coredata import MesonException +from .. import build +from ..coredata import MesonException import xml.etree.ElementTree as ET class Qt4Module(): diff --git a/meson/modules/qt5.py b/meson/modules/qt5.py index 0e732a1..81edc76 100644 --- a/meson/modules/qt5.py +++ b/meson/modules/qt5.py @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import dependencies, mlog +from .. import dependencies, mlog import os, subprocess -import build -from coredata import MesonException +from .. import build +from ..coredata import MesonException import xml.etree.ElementTree as ET class Qt5Module(): diff --git a/meson/modules/rpm.py b/meson/modules/rpm.py index eebecdd..a2c0502 100644 --- a/meson/modules/rpm.py +++ b/meson/modules/rpm.py @@ -15,11 +15,11 @@ '''This module provides helper functions for RPM related functionality such as generating template RPM spec file.''' -import build -import compilers -import datetime -import mlog -import modules.gnome +from .. import build +from .. import compilers +from .. import datetime +from .. import mlog +from .. import modules.gnome import os class RPMModule: diff --git a/meson/modules/windows.py b/meson/modules/windows.py index e01b454..a785250 100644 --- a/meson/modules/windows.py +++ b/meson/modules/windows.py @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mesonlib, dependencies, build -from coredata import MesonException +from .. import mesonlib, dependencies, build +from ..coredata import MesonException import os class WindowsModule: diff --git a/scripts/symbolextractor.py b/scripts/symbolextractor.py index f2c709d..fe86d35 100755 --- a/scripts/symbolextractor.py +++ b/scripts/symbolextractor.py @@ -23,7 +23,7 @@ # http://cgit.freedesktop.org/libreoffice/core/commit/?id=3213cd54b76bc80a6f0516aac75a48ff3b2ad67c import sys, subprocess -import mesonlib +from meson import mesonlib import argparse parser = argparse.ArgumentParser() |