diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 1 | ||||
| -rw-r--r-- | mesonbuild/build.py | 1 | ||||
| -rw-r--r-- | mesonbuild/dependencies.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter.py | 2 | ||||
| -rw-r--r-- | mesonbuild/mesonlib.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/qt5.py | 2 | ||||
| -rw-r--r-- | mesonbuild/scripts/meson_exe.py | 3 | ||||
| -rw-r--r-- | mesonbuild/scripts/meson_install.py | 2 | ||||
| -rw-r--r-- | mesonbuild/scripts/scanbuild.py | 2 | ||||
| -rw-r--r-- | mesonbuild/scripts/symbolextractor.py | 4 | ||||
| -rw-r--r-- | mesonbuild/scripts/yelphelper.py | 3 |
12 files changed, 11 insertions, 15 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index f3e9b4f..3fe8b11 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -14,7 +14,6 @@ import os, sys import pickle -import re import xml.dom.minidom import xml.etree.ElementTree as ET diff --git a/mesonbuild/build.py b/mesonbuild/build.py index db92858..47d589d 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from . import coredata from . import environment from . import dependencies from . import mlog diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py index aa3927f..ba70f4e 100644 --- a/mesonbuild/dependencies.py +++ b/mesonbuild/dependencies.py @@ -20,7 +20,7 @@ # package before this gets too big. import re -import os, stat, glob, subprocess, shutil +import os, stat, glob, shutil import sysconfig from collections import OrderedDict from . mesonlib import MesonException, version_compare, version_compare_many, Popen_safe diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index c92adaf..1f72d5f 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -29,7 +29,7 @@ from .interpreterbase import check_stringlist, noPosargs, noKwargs, stringArgs from .interpreterbase import InterpreterException, InvalidArguments, InvalidCode from .interpreterbase import InterpreterObject, MutableInterpreterObject -import os, sys, subprocess, shutil, uuid, re +import os, sys, shutil, uuid import importlib diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py index 622cd04..fab5803 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -14,7 +14,7 @@ """A library of random helper functionality.""" -import platform, subprocess, operator, os, shutil, re, sys +import platform, subprocess, operator, os, shutil, re from glob import glob diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index f74f9e9..6c59f52 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .. import coredata, build +from .. import build from .. import mesonlib from .. import mlog import os diff --git a/mesonbuild/modules/qt5.py b/mesonbuild/modules/qt5.py index da1ac83..35a475a 100644 --- a/mesonbuild/modules/qt5.py +++ b/mesonbuild/modules/qt5.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os, subprocess +import os from .. import mlog from .. import build from ..mesonlib import MesonException, Popen_safe diff --git a/mesonbuild/scripts/meson_exe.py b/mesonbuild/scripts/meson_exe.py index 938ec87..5c5c317 100644 --- a/mesonbuild/scripts/meson_exe.py +++ b/mesonbuild/scripts/meson_exe.py @@ -17,9 +17,8 @@ import sys import argparse import pickle import platform -import subprocess -from ..mesonlib import MesonException, Popen_safe +from ..mesonlib import Popen_safe options = None diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py index 0df79e3..11dd320 100644 --- a/mesonbuild/scripts/meson_install.py +++ b/mesonbuild/scripts/meson_install.py @@ -16,7 +16,7 @@ import sys, pickle, os, shutil, subprocess, gzip, platform from glob import glob from . import depfixer from . import destdir_join -from ..mesonlib import MesonException, Popen_safe +from ..mesonlib import Popen_safe install_log_file = None diff --git a/mesonbuild/scripts/scanbuild.py b/mesonbuild/scripts/scanbuild.py index 2ef22bd..e17d2ad 100644 --- a/mesonbuild/scripts/scanbuild.py +++ b/mesonbuild/scripts/scanbuild.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import sys, os +import os import subprocess import shutil import tempfile diff --git a/mesonbuild/scripts/symbolextractor.py b/mesonbuild/scripts/symbolextractor.py index 9272495..bfd629f 100644 --- a/mesonbuild/scripts/symbolextractor.py +++ b/mesonbuild/scripts/symbolextractor.py @@ -20,9 +20,9 @@ # This file is basically a reimplementation of # http://cgit.freedesktop.org/libreoffice/core/commit/?id=3213cd54b76bc80a6f0516aac75a48ff3b2ad67c -import os, sys, subprocess +import os, sys from .. import mesonlib -from ..mesonlib import MesonException, Popen_safe +from ..mesonlib import Popen_safe import argparse parser = argparse.ArgumentParser() diff --git a/mesonbuild/scripts/yelphelper.py b/mesonbuild/scripts/yelphelper.py index 7431a81..fe3e82a 100644 --- a/mesonbuild/scripts/yelphelper.py +++ b/mesonbuild/scripts/yelphelper.py @@ -12,12 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import sys, os +import os import subprocess import shutil import argparse from .. import mlog -from ..mesonlib import MesonException from . import destdir_join parser = argparse.ArgumentParser() |