diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index f3e9b4fe2..3fe8b1153 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 db92858e7..47d589db0 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 aa3927f46..ba70f4e4d 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 c92adaf30..1f72d5f8f 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 622cd04bf..fab5803b1 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 f74f9e9a3..6c59f5218 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 da1ac834a..35a475a5a 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 938ec8718..5c5c31776 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 0df79e39b..11dd32094 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 2ef22bd7e..e17d2ad8a 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 92724957f..bfd629f64 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 7431a8199..fe3e82a0f 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() diff --git a/run_tests.py b/run_tests.py index 752354e95..b85478fd0 100755 --- a/run_tests.py +++ b/run_tests.py @@ -14,8 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import subprocess, sys, os -import shutil +import subprocess, sys from mesonbuild import mesonlib if __name__ == '__main__': diff --git a/run_unittests.py b/run_unittests.py index 21d029d66..d11c3f3bc 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -20,7 +20,7 @@ import tempfile from glob import glob import mesonbuild.environment from mesonbuild.environment import detect_ninja -from mesonbuild.dependencies import PkgConfigDependency, Qt5Dependency +from mesonbuild.dependencies import PkgConfigDependency def get_soname(fname): # HACK, fix to not use shell. diff --git a/setup.py b/setup.py index 46f275040..b8f04afc3 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,6 @@ import os import sys -from os import path if sys.version_info[0] < 3: print('Tried to install with Python 2, Meson only supports Python 3.') @@ -34,7 +33,6 @@ except ImportError: from distutils.file_util import copy_file from distutils.dir_util import mkpath -from stat import ST_MODE class install_scripts(orig): def run(self): @@ -49,7 +47,7 @@ class install_scripts(orig): # We want the files to be installed without a suffix on Unix for infile in self.get_inputs(): in_stripped = infile[:-3] if infile.endswith('.py') else infile - outfile = path.join(self.install_dir, in_stripped) + outfile = os.path.join(self.install_dir, in_stripped) # NOTE: Mode is preserved by default copy_file(infile, outfile, dry_run=self.dry_run) self.outfiles.append(outfile) diff --git a/test cases/common/107 postconf/postconf.py b/test cases/common/107 postconf/postconf.py index 50c91ca24..950c7064a 100644 --- a/test cases/common/107 postconf/postconf.py +++ b/test cases/common/107 postconf/postconf.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -import sys, os +import os template = '''#pragma once diff --git a/test cases/common/113 generatorcustom/catter.py b/test cases/common/113 generatorcustom/catter.py index 7a6c085df..198fa98e2 100755 --- a/test cases/common/113 generatorcustom/catter.py +++ b/test cases/common/113 generatorcustom/catter.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -import sys, os +import sys output = sys.argv[-1] inputs = sys.argv[1:-1] diff --git a/test cases/common/113 generatorcustom/gen.py b/test cases/common/113 generatorcustom/gen.py index c8434974b..c1e34ed6c 100755 --- a/test cases/common/113 generatorcustom/gen.py +++ b/test cases/common/113 generatorcustom/gen.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -import sys, os +import sys ifile = sys.argv[1] ofile = sys.argv[2] diff --git a/test cases/common/129 object only target/obj_generator.py b/test cases/common/129 object only target/obj_generator.py index 0a4537bb6..a1f7421eb 100755 --- a/test cases/common/129 object only target/obj_generator.py +++ b/test cases/common/129 object only target/obj_generator.py @@ -2,7 +2,7 @@ # Mimic a binary that generates an object file (e.g. windres). -import sys, shutil, subprocess +import sys, subprocess if __name__ == '__main__': if len(sys.argv) != 4: diff --git a/test cases/common/57 custom target chain/usetarget/subcomp.py b/test cases/common/57 custom target chain/usetarget/subcomp.py index 6f4b68603..52dc0bbb5 100755 --- a/test cases/common/57 custom target chain/usetarget/subcomp.py +++ b/test cases/common/57 custom target chain/usetarget/subcomp.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -import sys, os +import sys with open(sys.argv[1], 'rb') as ifile: with open(sys.argv[2], 'w') as ofile: diff --git a/test cases/common/59 object generator/obj_generator.py b/test cases/common/59 object generator/obj_generator.py index 204f1eb40..70f9204fa 100755 --- a/test cases/common/59 object generator/obj_generator.py +++ b/test cases/common/59 object generator/obj_generator.py @@ -2,7 +2,7 @@ # Mimic a binary that generates an object file (e.g. windres). -import sys, shutil, subprocess +import sys, subprocess if __name__ == '__main__': if len(sys.argv) != 4: diff --git a/test cases/common/95 dep fallback/subprojects/boblib/genbob.py b/test cases/common/95 dep fallback/subprojects/boblib/genbob.py index 824194b0d..7da323382 100644 --- a/test cases/common/95 dep fallback/subprojects/boblib/genbob.py +++ b/test cases/common/95 dep fallback/subprojects/boblib/genbob.py @@ -1,6 +1,5 @@ #!/usr/bin/env python -import os import sys with open(sys.argv[1], 'w') as f: diff --git a/test cases/common/98 gen extra/srcgen.py b/test cases/common/98 gen extra/srcgen.py index 73bc33743..8988cd92f 100755 --- a/test cases/common/98 gen extra/srcgen.py +++ b/test cases/common/98 gen extra/srcgen.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 import sys -import os import argparse parser = argparse.ArgumentParser() diff --git a/test cases/vala/8 generated sources/src/copy_file.py b/test cases/vala/8 generated sources/src/copy_file.py index b90d91fd5..ff42ac359 100644 --- a/test cases/vala/8 generated sources/src/copy_file.py +++ b/test cases/vala/8 generated sources/src/copy_file.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -import os import sys import shutil