From 7737c17d529be18ea7f6d469b715e165fd719592 Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Sat, 9 Apr 2022 15:17:54 +0200 Subject: [PATCH] wscript: drop unused imports, scripted Done with ad hoc scripting hacks processing unused imports found by pyflakes: for f in $( find * -name wscript ); do echo; pyflakes $f; done | grep 'waflib.Logs.* but unused' | cut -d: -f1 | while read f; do sed -i 's/^import waflib.Logs as Logs,/import/g' $f; done for f in $( find * -name wscript ); do echo; pyflakes $f; done | grep 'waflib.Options.* but unused' | cut -d: -f1 | while read f; do sed -i 's/import waflib.Options as Options, /import /g' $f; done for f in $( find * -name wscript ); do echo; pyflakes $f; done | grep 'waflib.Options.* but unused' | cut -d: -f1 | while read f; do sed -i 's/^from waflib import Options,/from waflib import/g' $f; done for f in $( find * -name wscript ); do echo; pyflakes $f; done | grep ' imported but unused$' | sed "s/^\([^:]*\):[0-9]*:[0-9]* '\(.*\)'.*/\1 \2/g" | while read f lib; do sed -i "/^import $lib$/d" $f; done for f in $( find * -name wscript ); do echo; pyflakes $f; done | grep 'waflib.Options.* but unused' | cut -d: -f1 | while read f; do sed -i '/from waflib import Options$/d' $f; done for f in $( find * -name wscript ); do echo; pyflakes $f; done | grep 'waflib.TaskGen.* but unused' | cut -d: -f1 | while read f; do sed -i '/from waflib import TaskGen$/d' $f; done for f in $( find * -name wscript ); do echo; pyflakes $f; done | grep 'waflib.Task.Task.* but unused' | cut -d: -f1 | while read f; do sed -i '/^from waflib.Task import Task$/d' $f; done for f in $( find * -name wscript ); do echo; pyflakes $f; done | grep 'waflib.Tools.winres.* but unused' | cut -d: -f1 | while read f; do sed -i '/^from waflib.Tools import winres$/d' $f; done for f in $( find * -name wscript ); do echo; pyflakes $f; done | grep 'waflib.Utils.* but unused' | cut -d: -f1 | while read f; do sed -i '/^import waflib.Utils as Utils$/d' $f; done --- gtk2_ardour/wscript | 5 ----- headless/wscript | 6 ------ libs/ardour/wscript | 3 --- libs/audiographer/wscript | 1 - libs/auscan/wscript | 2 -- libs/backends/alsa/wscript | 2 -- libs/backends/coreaudio/wscript | 2 -- libs/backends/dummy/wscript | 2 -- libs/backends/portaudio/wscript | 3 --- libs/backends/pulseaudio/wscript | 2 -- libs/backends/wscript | 4 ---- libs/canvas/wscript | 2 -- libs/ctrl-interface/control_protocol/wscript | 1 - libs/ctrl-interface/midi_surface/wscript | 1 - libs/ctrl-interface/wscript | 1 - libs/fluidsynth/wscript | 3 --- libs/fst/wscript | 5 ----- libs/gtkmm2ext/wscript | 2 -- libs/hidapi/wscript | 2 -- libs/libltc/wscript | 3 --- libs/lua/wscript | 3 --- libs/midi++2/wscript | 3 --- libs/panners/wscript | 2 -- libs/pbd/wscript | 1 - libs/plugins/a-comp.lv2/wscript | 4 +--- libs/plugins/a-delay.lv2/wscript | 4 +--- libs/plugins/a-eq.lv2/wscript | 4 +--- libs/plugins/a-exp.lv2/wscript | 4 +--- libs/plugins/a-fluidsynth.lv2/wscript | 4 +--- libs/plugins/a-reverb.lv2/wscript | 4 +--- libs/plugins/reasonablesynth.lv2/wscript | 4 +--- libs/ptformat/wscript | 1 - libs/qm-dsp/wscript | 1 - libs/temporal/wscript | 1 - libs/vfork/wscript | 2 -- libs/waveview/wscript | 3 --- libs/widgets/wscript | 3 --- libs/zita-convolver/wscript | 3 --- libs/zita-resampler/wscript | 3 --- luasession/wscript | 7 +------ session_utils/wscript | 7 +------ tools/bb/wscript | 2 +- tools/gccabicheck/wscript | 2 -- tools/sanity_check/wscript | 2 -- wscript | 2 -- 45 files changed, 10 insertions(+), 118 deletions(-) diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 151aa8e178..a14ff18af8 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -3,15 +3,10 @@ from waflib.extras import autowaf as autowaf from waflib import Options, TaskGen import waflib.Logs as Logs, waflib.Utils as Utils import os -import shutil import sys import re -import time -from waflib.Task import Task -from waflib.Tools import winres import subprocess import glob -import copy # Mandatory variables top = '.' diff --git a/headless/wscript b/headless/wscript index 104bd5b4a6..8d6fe0586d 100644 --- a/headless/wscript +++ b/headless/wscript @@ -1,13 +1,7 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options, TaskGen -import waflib.Logs as Logs, waflib.Utils as Utils import os -import shutil import sys -import re -import time -from waflib.Task import Task # Mandatory variables top = '.' diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 90942670d5..0771b71462 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -2,10 +2,7 @@ from waflib.extras import autowaf as autowaf from waflib import Options, Task, Tools import os -import sys import re -import subprocess -import sys # default state file version for this build CURRENT_SESSION_FILE_VERSION = 7002 diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript index bc6160bf6d..9034b0a452 100644 --- a/libs/audiographer/wscript +++ b/libs/audiographer/wscript @@ -1,7 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- from waflib.extras import autowaf as autowaf -import os # Version of this package (even if built as a child) AUDIOGRAPHER_VERSION = '0.0.0' diff --git a/libs/auscan/wscript b/libs/auscan/wscript index 67de4c8f1c..75ab3ef35b 100644 --- a/libs/auscan/wscript +++ b/libs/auscan/wscript @@ -1,8 +1,6 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import TaskGen import os -import sys # Mandatory variables top = '.' diff --git a/libs/backends/alsa/wscript b/libs/backends/alsa/wscript index ebeaad2ca8..8a3fb81154 100644 --- a/libs/backends/alsa/wscript +++ b/libs/backends/alsa/wscript @@ -1,8 +1,6 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf import os -import sys -import re I18N_PACKAGE = 'alsa-backend' diff --git a/libs/backends/coreaudio/wscript b/libs/backends/coreaudio/wscript index f7ab400bbf..55437f7a4b 100644 --- a/libs/backends/coreaudio/wscript +++ b/libs/backends/coreaudio/wscript @@ -2,8 +2,6 @@ from waflib.extras import autowaf as autowaf from waflib import Options import os -import sys -import re I18N_PACKAGE = 'coreaudio-backend' diff --git a/libs/backends/dummy/wscript b/libs/backends/dummy/wscript index 717e6dc1c1..7ebb95c14d 100644 --- a/libs/backends/dummy/wscript +++ b/libs/backends/dummy/wscript @@ -1,8 +1,6 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf import os -import sys -import re I18N_PACKAGE = 'dummy-backend' diff --git a/libs/backends/portaudio/wscript b/libs/backends/portaudio/wscript index 2a7bc2323b..cfb88c23f2 100644 --- a/libs/backends/portaudio/wscript +++ b/libs/backends/portaudio/wscript @@ -1,9 +1,6 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options import os -import sys -import re I18N_PACKAGE = 'portaudio-backend' diff --git a/libs/backends/pulseaudio/wscript b/libs/backends/pulseaudio/wscript index ca5258c869..3deb08ef59 100644 --- a/libs/backends/pulseaudio/wscript +++ b/libs/backends/pulseaudio/wscript @@ -1,8 +1,6 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf import os -import sys -import re I18N_PACKAGE = 'pulse-backend' diff --git a/libs/backends/wscript b/libs/backends/wscript index 8eaa1232fd..1822550875 100644 --- a/libs/backends/wscript +++ b/libs/backends/wscript @@ -1,9 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options -import os -import sys -import re # Mandatory variables top = '.' diff --git a/libs/canvas/wscript b/libs/canvas/wscript index df0c1b7186..9093ea6bf0 100644 --- a/libs/canvas/wscript +++ b/libs/canvas/wscript @@ -1,7 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options -from waflib import TaskGen import os # Version of this package (even if built as a child) diff --git a/libs/ctrl-interface/control_protocol/wscript b/libs/ctrl-interface/control_protocol/wscript index fdcf6e78f4..9c2283f10f 100644 --- a/libs/ctrl-interface/control_protocol/wscript +++ b/libs/ctrl-interface/control_protocol/wscript @@ -1,6 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -import os # Mandatory variables top = '.' diff --git a/libs/ctrl-interface/midi_surface/wscript b/libs/ctrl-interface/midi_surface/wscript index f90f58f3db..b4693d3de0 100644 --- a/libs/ctrl-interface/midi_surface/wscript +++ b/libs/ctrl-interface/midi_surface/wscript @@ -1,6 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -import os # Mandatory variables top = '.' diff --git a/libs/ctrl-interface/wscript b/libs/ctrl-interface/wscript index 9422be6bf2..bbc54255a4 100644 --- a/libs/ctrl-interface/wscript +++ b/libs/ctrl-interface/wscript @@ -1,6 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options # Mandatory variables top = '.' diff --git a/libs/fluidsynth/wscript b/libs/fluidsynth/wscript index 2eb281c41c..4f90277ee6 100644 --- a/libs/fluidsynth/wscript +++ b/libs/fluidsynth/wscript @@ -1,8 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import TaskGen -import os -import sys # Version of this package (even if built as a child) MAJOR = '2' diff --git a/libs/fst/wscript b/libs/fst/wscript index 205f09a43e..1bae79fd18 100644 --- a/libs/fst/wscript +++ b/libs/fst/wscript @@ -1,13 +1,8 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options, TaskGen -import waflib.Logs as Logs, waflib.Utils as Utils import os -import shutil import sys import re -import time -from waflib.Task import Task # Mandatory variables top = '.' diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript index c75059d707..d8670d6baf 100644 --- a/libs/gtkmm2ext/wscript +++ b/libs/gtkmm2ext/wscript @@ -1,9 +1,7 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options import os import sys -import platform as PLATFORM # Version of this package (even if built as a child) MAJOR = '0' diff --git a/libs/hidapi/wscript b/libs/hidapi/wscript index b2fcd91393..136ea61138 100644 --- a/libs/hidapi/wscript +++ b/libs/hidapi/wscript @@ -1,7 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options -import os import re import sys diff --git a/libs/libltc/wscript b/libs/libltc/wscript index c872c04e44..9d4e57209f 100644 --- a/libs/libltc/wscript +++ b/libs/libltc/wscript @@ -1,8 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import TaskGen -import os -import sys # Version of this package (even if built as a child) MAJOR = '1' diff --git a/libs/lua/wscript b/libs/lua/wscript index 467e1eee0f..0397de2f7f 100644 --- a/libs/lua/wscript +++ b/libs/lua/wscript @@ -1,8 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import TaskGen -import os -import sys # Variables for 'waf dist' APPNAME = 'liblua' diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript index e44a258196..b21e5ba8da 100644 --- a/libs/midi++2/wscript +++ b/libs/midi++2/wscript @@ -1,8 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options -import os -import sys # Version of this package (even if built as a child) MAJOR = '2' diff --git a/libs/panners/wscript b/libs/panners/wscript index 731173ba42..a25e777bba 100644 --- a/libs/panners/wscript +++ b/libs/panners/wscript @@ -1,7 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options -import os # Mandatory variables top = '.' diff --git a/libs/pbd/wscript b/libs/pbd/wscript index 4696ec6a8c..f492a4fa97 100644 --- a/libs/pbd/wscript +++ b/libs/pbd/wscript @@ -2,7 +2,6 @@ from waflib.extras import autowaf as autowaf from waflib import Options from waflib import TaskGen -import os import sys # Version of this package (even if built as a child) diff --git a/libs/plugins/a-comp.lv2/wscript b/libs/plugins/a-comp.lv2/wscript index 636803b905..29a50d5fb5 100644 --- a/libs/plugins/a-comp.lv2/wscript +++ b/libs/plugins/a-comp.lv2/wscript @@ -1,9 +1,7 @@ #!/usr/bin/env python -import os import re -import shutil import waflib.extras.autowaf as autowaf -import waflib.Options as Options, waflib.Utils as Utils +import waflib.Utils as Utils # Mandatory variables top = '.' diff --git a/libs/plugins/a-delay.lv2/wscript b/libs/plugins/a-delay.lv2/wscript index f0e2e79aa9..9def1bba5a 100644 --- a/libs/plugins/a-delay.lv2/wscript +++ b/libs/plugins/a-delay.lv2/wscript @@ -1,9 +1,7 @@ #!/usr/bin/env python -import os import re -import shutil import waflib.extras.autowaf as autowaf -import waflib.Options as Options, waflib.Utils as Utils +import waflib.Utils as Utils # Mandatory variables top = '.' diff --git a/libs/plugins/a-eq.lv2/wscript b/libs/plugins/a-eq.lv2/wscript index 26d69c569d..a88d38dcce 100644 --- a/libs/plugins/a-eq.lv2/wscript +++ b/libs/plugins/a-eq.lv2/wscript @@ -1,9 +1,7 @@ #!/usr/bin/env python -import os import re -import shutil import waflib.extras.autowaf as autowaf -import waflib.Options as Options, waflib.Utils as Utils +import waflib.Utils as Utils # Mandatory variables top = '.' diff --git a/libs/plugins/a-exp.lv2/wscript b/libs/plugins/a-exp.lv2/wscript index f048327fa1..e0393b0930 100644 --- a/libs/plugins/a-exp.lv2/wscript +++ b/libs/plugins/a-exp.lv2/wscript @@ -1,9 +1,7 @@ #!/usr/bin/env python -import os import re -import shutil import waflib.extras.autowaf as autowaf -import waflib.Options as Options, waflib.Utils as Utils +import waflib.Utils as Utils # Mandatory variables top = '.' diff --git a/libs/plugins/a-fluidsynth.lv2/wscript b/libs/plugins/a-fluidsynth.lv2/wscript index 9cbce04f37..40e39517e5 100644 --- a/libs/plugins/a-fluidsynth.lv2/wscript +++ b/libs/plugins/a-fluidsynth.lv2/wscript @@ -1,9 +1,7 @@ #!/usr/bin/env python -import os import re -import shutil import waflib.extras.autowaf as autowaf -import waflib.Options as Options, waflib.Utils as Utils +import waflib.Utils as Utils # Mandatory variables top = '.' diff --git a/libs/plugins/a-reverb.lv2/wscript b/libs/plugins/a-reverb.lv2/wscript index 1186563e8e..ba757da88e 100644 --- a/libs/plugins/a-reverb.lv2/wscript +++ b/libs/plugins/a-reverb.lv2/wscript @@ -1,9 +1,7 @@ #!/usr/bin/env python -import os import re -import shutil import waflib.extras.autowaf as autowaf -import waflib.Options as Options, waflib.Utils as Utils +import waflib.Utils as Utils # Mandatory variables top = '.' diff --git a/libs/plugins/reasonablesynth.lv2/wscript b/libs/plugins/reasonablesynth.lv2/wscript index ef15b28c4b..5ecda413c8 100644 --- a/libs/plugins/reasonablesynth.lv2/wscript +++ b/libs/plugins/reasonablesynth.lv2/wscript @@ -1,9 +1,7 @@ #!/usr/bin/env python -import os import re -import shutil import waflib.extras.autowaf as autowaf -import waflib.Options as Options, waflib.Utils as Utils +import waflib.Utils as Utils # Mandatory variables top = '.' diff --git a/libs/ptformat/wscript b/libs/ptformat/wscript index aedae89a8e..3c19e9fc45 100644 --- a/libs/ptformat/wscript +++ b/libs/ptformat/wscript @@ -1,6 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -import os # Version of this package (even if built as a child) LIBPTFORMAT_VERSION = '0.0.0' diff --git a/libs/qm-dsp/wscript b/libs/qm-dsp/wscript index a59801bf36..a6cba57c81 100644 --- a/libs/qm-dsp/wscript +++ b/libs/qm-dsp/wscript @@ -1,6 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -import os # Version of this package (even if built as a child) QM_DSP_VERSION = '1.7.1' diff --git a/libs/temporal/wscript b/libs/temporal/wscript index 7a22e74e49..8ead28d681 100644 --- a/libs/temporal/wscript +++ b/libs/temporal/wscript @@ -1,6 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options import os # Mandatory variables diff --git a/libs/vfork/wscript b/libs/vfork/wscript index 8de403cd16..0d71723dc8 100644 --- a/libs/vfork/wscript +++ b/libs/vfork/wscript @@ -1,8 +1,6 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import TaskGen import os -import sys # Mandatory variables top = '.' diff --git a/libs/waveview/wscript b/libs/waveview/wscript index e49be62f6f..f76a2f4b55 100644 --- a/libs/waveview/wscript +++ b/libs/waveview/wscript @@ -1,8 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options -from waflib import TaskGen -import os # Version of this package (even if built as a child) MAJOR = '0' diff --git a/libs/widgets/wscript b/libs/widgets/wscript index 8cdd2667fc..8b6bf41d34 100644 --- a/libs/widgets/wscript +++ b/libs/widgets/wscript @@ -1,8 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options -from waflib import TaskGen -import os # Version of this package (even if built as a child) MAJOR = '0' diff --git a/libs/zita-convolver/wscript b/libs/zita-convolver/wscript index 4b29cccb89..d8b3d1129f 100644 --- a/libs/zita-convolver/wscript +++ b/libs/zita-convolver/wscript @@ -1,8 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options -from waflib import TaskGen -import os # Version of this package (even if built as a child) MAJOR = '4' diff --git a/libs/zita-resampler/wscript b/libs/zita-resampler/wscript index 54c851e72e..6917ba1526 100644 --- a/libs/zita-resampler/wscript +++ b/libs/zita-resampler/wscript @@ -1,8 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options -from waflib import TaskGen -import os # Version of this package (even if built as a child) MAJOR = '1' diff --git a/luasession/wscript b/luasession/wscript index 9a0454b1aa..a0598261cb 100644 --- a/luasession/wscript +++ b/luasession/wscript @@ -1,13 +1,8 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options, TaskGen -import waflib.Logs as Logs, waflib.Utils as Utils +import waflib.Utils as Utils import os -import shutil import sys -import re -import time -from waflib.Task import Task top = '.' out = 'build' diff --git a/session_utils/wscript b/session_utils/wscript index 5e9b441931..d916931e12 100644 --- a/session_utils/wscript +++ b/session_utils/wscript @@ -1,13 +1,8 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options, TaskGen -import waflib.Logs as Logs, waflib.Utils as Utils +import waflib.Utils as Utils import os -import shutil import sys -import re -import time -from waflib.Task import Task # Mandatory variables top = '.' diff --git a/tools/bb/wscript b/tools/bb/wscript index 241afa6183..b64ead9baa 100644 --- a/tools/bb/wscript +++ b/tools/bb/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import waflib.Logs as Logs, waflib.Utils as Utils +import waflib.Utils as Utils import os # Mandatory variables diff --git a/tools/gccabicheck/wscript b/tools/gccabicheck/wscript index 12af753ea6..4183cbe0b7 100644 --- a/tools/gccabicheck/wscript +++ b/tools/gccabicheck/wscript @@ -1,7 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options -import os import re import sys diff --git a/tools/sanity_check/wscript b/tools/sanity_check/wscript index 406e0778a9..9e50f6fc3d 100644 --- a/tools/sanity_check/wscript +++ b/tools/sanity_check/wscript @@ -1,7 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options -import os # Mandatory variables top = '.' diff --git a/wscript b/wscript index f4df8abc8f..c29557acb0 100644 --- a/wscript +++ b/wscript @@ -3,11 +3,9 @@ from waflib.extras import autowaf as autowaf from waflib import Options import os import re -import string import subprocess import sys import platform as PLATFORM -from waflib.Tools import winres from waflib.Build import Context from waflib.Build import BuildContext import waflib.Utils as Utils