aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Gnatenko <i.gnatenko.brain@gmail.com>2016-12-19 18:19:35 +0100
committerIgor Gnatenko <i.gnatenko.brain@gmail.com>2016-12-19 18:19:35 +0100
commit8268eb49598c9c43ed4e52bdca63b38440c5b922 (patch)
tree45b686ad40c696b05d3832599f74fbe24f9e012e
parent7d71e9f8b2b303c20c1e7e00f14feca0ec5e08f2 (diff)
downloadmeson-8268eb49598c9c43ed4e52bdca63b38440c5b922.zip
meson-8268eb49598c9c43ed4e52bdca63b38440c5b922.tar.gz
meson-8268eb49598c9c43ed4e52bdca63b38440c5b922.tar.bz2
tree-wide: remove unused imports
./setup.py:17:1: F401 'os' imported but unused import os ^ ./setup.py:37:1: F401 'stat.ST_MODE' imported but unused from stat import ST_MODE ^ ./run_tests.py:17:1: F401 'os' imported but unused import subprocess, sys, os ^ ./run_tests.py:18:1: F401 'shutil' imported but unused import shutil ^ ./run_unittests.py:23:1: F401 'mesonbuild.dependencies.Qt5Dependency' imported but unused from mesonbuild.dependencies import PkgConfigDependency, Qt5Dependency ^ ./mesonbuild/build.py:15:1: F401 '.coredata' imported but unused from . import coredata ^ ./mesonbuild/interpreter.py:32:1: F401 'subprocess' imported but unused import os, sys, subprocess, shutil, uuid, re ^ ./mesonbuild/interpreter.py:32:1: F401 're' imported but unused import os, sys, subprocess, shutil, uuid, re ^ ./mesonbuild/dependencies.py:23:1: F401 'subprocess' imported but unused import os, stat, glob, subprocess, shutil ^ ./mesonbuild/mesonlib.py:17:1: F401 'sys' imported but unused import platform, subprocess, operator, os, shutil, re, sys ^ ./mesonbuild/modules/qt5.py:15:1: F401 'subprocess' imported but unused import os, subprocess ^ ./mesonbuild/modules/pkgconfig.py:15:1: F401 '..coredata' imported but unused from .. import coredata, build ^ ./mesonbuild/scripts/scanbuild.py:15:1: F401 'sys' imported but unused import sys, os ^ ./mesonbuild/scripts/meson_exe.py:20:1: F401 'subprocess' imported but unused import subprocess ^ ./mesonbuild/scripts/meson_exe.py:22:1: F401 '..mesonlib.MesonException' imported but unused from ..mesonlib import MesonException, Popen_safe ^ ./mesonbuild/scripts/symbolextractor.py:23:1: F401 'subprocess' imported but unused import os, sys, subprocess ^ ./mesonbuild/scripts/symbolextractor.py:25:1: F401 '..mesonlib.MesonException' imported but unused from ..mesonlib import MesonException, Popen_safe ^ ./mesonbuild/scripts/meson_install.py:19:1: F401 '..mesonlib.MesonException' imported but unused from ..mesonlib import MesonException, Popen_safe ^ ./mesonbuild/scripts/yelphelper.py:15:1: F401 'sys' imported but unused import sys, os ^ ./mesonbuild/scripts/yelphelper.py:20:1: F401 '..mesonlib.MesonException' imported but unused from ..mesonlib import MesonException ^ ./mesonbuild/backend/vs2010backend.py:17:1: F401 're' imported but unused import re ^ ./test cases/vala/8 generated sources/src/copy_file.py:3:1: F401 'os' imported but unused import os ^ ./test cases/common/107 postconf/postconf.py:3:1: F401 'sys' imported but unused import sys, os ^ ./test cases/common/129 object only target/obj_generator.py:5:1: F401 'shutil' imported but unused import sys, shutil, subprocess ^ ./test cases/common/57 custom target chain/usetarget/subcomp.py:3:1: F401 'os' imported but unused import sys, os ^ ./test cases/common/95 dep fallback/subprojects/boblib/genbob.py:3:1: F401 'os' imported but unused import os ^ ./test cases/common/98 gen extra/srcgen.py:4:1: F401 'os' imported but unused import os ^ ./test cases/common/113 generatorcustom/gen.py:3:1: F401 'os' imported but unused import sys, os ^ ./test cases/common/113 generatorcustom/catter.py:3:1: F401 'os' imported but unused import sys, os ^ ./test cases/common/59 object generator/obj_generator.py:5:1: F401 'shutil' imported but unused import sys, shutil, subprocess ^ Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
-rw-r--r--mesonbuild/backend/vs2010backend.py1
-rw-r--r--mesonbuild/build.py1
-rw-r--r--mesonbuild/dependencies.py2
-rw-r--r--mesonbuild/interpreter.py2
-rw-r--r--mesonbuild/mesonlib.py2
-rw-r--r--mesonbuild/modules/pkgconfig.py2
-rw-r--r--mesonbuild/modules/qt5.py2
-rw-r--r--mesonbuild/scripts/meson_exe.py3
-rw-r--r--mesonbuild/scripts/meson_install.py2
-rw-r--r--mesonbuild/scripts/scanbuild.py2
-rw-r--r--mesonbuild/scripts/symbolextractor.py4
-rw-r--r--mesonbuild/scripts/yelphelper.py3
-rwxr-xr-xrun_tests.py3
-rwxr-xr-xrun_unittests.py2
-rw-r--r--setup.py4
-rw-r--r--test cases/common/107 postconf/postconf.py2
-rwxr-xr-xtest cases/common/113 generatorcustom/catter.py2
-rwxr-xr-xtest cases/common/113 generatorcustom/gen.py2
-rwxr-xr-xtest cases/common/129 object only target/obj_generator.py2
-rwxr-xr-xtest cases/common/57 custom target chain/usetarget/subcomp.py2
-rwxr-xr-xtest cases/common/59 object generator/obj_generator.py2
-rw-r--r--test cases/common/95 dep fallback/subprojects/boblib/genbob.py1
-rwxr-xr-xtest cases/common/98 gen extra/srcgen.py1
-rw-r--r--test cases/vala/8 generated sources/src/copy_file.py1
24 files changed, 20 insertions, 30 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()
diff --git a/run_tests.py b/run_tests.py
index 752354e..b85478f 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 21d029d..d11c3f3 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 46f2750..b8f04af 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 50c91ca..950c706 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 7a6c085..198fa98 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 c843497..c1e34ed 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 0a4537b..a1f7421 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 6f4b686..52dc0bb 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 204f1eb..70f9204 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 824194b..7da3233 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 73bc337..8988cd9 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 b90d91f..ff42ac3 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