aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mesonbuild/backend/ninjabackend.py2
-rw-r--r--mesonbuild/backend/vs2015backend.py1
-rw-r--r--mesonbuild/environment.py8
-rw-r--r--mesonbuild/scripts/dist.py3
-rwxr-xr-xrun_unittests.py5
5 files changed, 10 insertions, 9 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index de03db4..928e9bf 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -21,7 +21,7 @@ from .. import dependencies
from .. import compilers
from ..compilers import CompilerArgs
from ..mesonlib import File, MesonException, OrderedSet
-from ..mesonlib import get_meson_script, get_compiler_for_source, Popen_safe
+from ..mesonlib import get_meson_script, get_compiler_for_source
from .backends import CleanTrees, InstallData
from ..build import InvalidArguments
import os, sys, pickle, re
diff --git a/mesonbuild/backend/vs2015backend.py b/mesonbuild/backend/vs2015backend.py
index b8e3504..eb543ee 100644
--- a/mesonbuild/backend/vs2015backend.py
+++ b/mesonbuild/backend/vs2015backend.py
@@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from xml.etree import ElementTree as ET
from .vs2010backend import Vs2010Backend
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 13bbe62..c34b2e7 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -12,10 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import os, re, subprocess, platform
-from . import coredata
-from . import mesonlib
-from . import mlog
+import os
+import platform
+import re
+
from .compilers import *
from .mesonlib import EnvironmentException, Popen_safe
import configparser
diff --git a/mesonbuild/scripts/dist.py b/mesonbuild/scripts/dist.py
index ba6df7d..4184a5b 100644
--- a/mesonbuild/scripts/dist.py
+++ b/mesonbuild/scripts/dist.py
@@ -13,9 +13,8 @@
# limitations under the License.
-import os, sys
+import os
import shutil
-import argparse
import subprocess
import pickle
import hashlib
diff --git a/run_unittests.py b/run_unittests.py
index ec9d53b..b8e5ff9 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -18,7 +18,10 @@ import shlex
import subprocess
import re, json
import tempfile
-import unittest, os, sys, shutil, time
+import os
+import shutil
+import sys
+import unittest
from glob import glob
from pathlib import PurePath
import mesonbuild.compilers