Cleanup: removed most unused variables and imports

waflib/Configure.py

@@ -151,14 +151,8 @@ class ConfigurationContext(Context.Context):
 			if ver:
 				app = "%s (%s)" % (app, ver)
 
-		now = time.ctime()
-		pyver = sys.hexversion
-		systype = sys.platform
-		args = " ".join(sys.argv)
-		wafver = Context.WAFVERSION
-		abi = Context.ABI
-		self.to_log(conf_template % vars())
-
+		params = {'now': time.ctime(), 'pyver': sys.hexversion, 'systype': sys.platform, 'args': " ".join(sys.argv), 'wafver': Context.WAFVERSION, 'abi': Context.ABI, 'app': app}
+		self.to_log(conf_template % params)
 		self.msg('Setting top to', self.srcnode.abspath())
 		self.msg('Setting out to', self.bldnode.abspath())
 

waflib/Logs.py

@@ -321,7 +321,7 @@ def free_logger(logger):
 		for x in logger.handlers:
 			x.close()
 			logger.removeHandler(x)
-	except Exception as e:
+	except Exception:
 		pass
 
 def pprint(col, msg, label='', sep='\n'):

waflib/Node.py

@@ -251,7 +251,7 @@ class Node(object):
 				cur.children = self.dict_class()
 			else:
 				try:
-					cur = cur.children[x]
+					cur = ch[x]
 					continue
 				except KeyError:
 					pass

waflib/Tools/asm.py

@@ -34,11 +34,10 @@ Support for pure asm programs and libraries should also work::
 			target = 'asmtest')
 """
 
-import os, sys
-from waflib import Task, Utils
+from waflib import Task
 import waflib.Task
 from waflib.Tools.ccroot import link_task, stlink_task
-from waflib.TaskGen import extension, feature
+from waflib.TaskGen import extension
 
 class asm(Task.Task):
 	"""

waflib/Tools/c_aliases.py

@@ -4,8 +4,7 @@
 
 "base for all c/c++ programs and libraries"
 
-import os, sys, re
-from waflib import Utils, Build, Errors
+from waflib import Utils, Errors
 from waflib.Configure import conf
 
 def get_extensions(lst):

waflib/Tools/c_osx.py

@@ -6,8 +6,8 @@
 MacOSX related tools
 """
 
-import os, shutil, sys, platform
-from waflib import TaskGen, Task, Build, Options, Utils, Errors
+import os, shutil, platform
+from waflib import Task, Utils, Errors
 from waflib.TaskGen import taskgen_method, feature, after_method, before_method
 
 app_info = '''
@@ -48,7 +48,6 @@ def create_bundle_dirs(self, name, out):
 	"""
 	Create bundle folders, used by :py:func:`create_task_macplist` and :py:func:`create_task_macapp`
 	"""
-	bld = self.bld
 	dir = out.parent.find_or_declare(name)
 	dir.mkdir()
 	macos = dir.find_or_declare(['Contents', 'MacOS'])
@@ -102,7 +101,7 @@ def create_task_macapp(self):
 			inst_to = getattr(self, 'install_path', '/Applications') + '/%s/Resources' % name
 			for node in self.to_nodes(self.mac_files):
 				relpath = node.path_from(mac_files_root or node.parent)
-				tsk = self.create_task('macapp', node, res_dir.make_node(relpath))
+				self.create_task('macapp', node, res_dir.make_node(relpath))
 				self.bld.install_as(os.path.join(inst_to, relpath), node)
 
 		if getattr(self, 'mac_resources', None):
@@ -121,7 +120,7 @@ def create_task_macapp(self):
 					nodes = [node]
 				for node in nodes:
 					rel = node.path_from(parent)
-					tsk = self.create_task('macapp', node, res_dir.make_node(rel))
+					self.create_task('macapp', node, res_dir.make_node(rel))
 					self.bld.install_as(inst_to + '/%s' % rel, node)
 
 		if getattr(self.bld, 'is_install', None):

waflib/Tools/c_tests.py

@@ -9,7 +9,6 @@ Various configuration tests.
 from waflib import Task
 from waflib.Configure import conf
 from waflib.TaskGen import feature, before_method, after_method
-import sys
 
 LIB_CODE = '''
 #ifdef _MSC_VER

waflib/Tools/clang.py

@@ -6,7 +6,6 @@
 Detect the Clang C compiler
 """
 
-import os, sys
 from waflib.Tools import ccroot, ar, gcc
 from waflib.Configure import conf
 

waflib/Tools/clangxx.py

@@ -6,7 +6,6 @@
 Detect the Clang++ C++ compiler
 """
 
-import os, sys
 from waflib.Tools import ccroot, ar, gxx
 from waflib.Configure import conf
 

waflib/Tools/compiler_c.py

@@ -30,9 +30,9 @@ Not all compilers need to have a specific tool. For example, the clang compilers
 	$ CC=clang waf configure
 """
 
-import os, sys, imp, types, re
+import re
 from waflib.Tools import ccroot
-from waflib import Utils, Configure
+from waflib import Utils
 from waflib.Logs import debug
 
 c_compiler = {

waflib/Tools/compiler_cxx.py

@@ -31,9 +31,9 @@ Not all compilers need to have a specific tool. For example, the clang compilers
 """
 
 
-import os, sys, imp, types, re
+import re
 from waflib.Tools import ccroot
-from waflib import Utils, Configure
+from waflib import Utils
 from waflib.Logs import debug
 
 cxx_compiler = {

waflib/Tools/compiler_d.py

@@ -20,8 +20,8 @@ Only three D compilers are really present at the moment:
 * ldc2
 """
 
-import os, sys, imp, types, re
-from waflib import Utils, Configure, Options, Logs
+import re
+from waflib import Utils, Logs
 
 d_compiler = {
 'default' : ['gdc', 'dmd', 'ldc2']

waflib/Tools/compiler_fc.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-import os, sys, imp, types, re
-from waflib import Utils, Configure, Options, Logs, Errors
+import re
+from waflib import Utils, Logs
 from waflib.Tools import fc
 
 fc_compiler = {

waflib/Tools/cs.py

@@ -21,7 +21,7 @@ Note that the configuration may compile C# snippets::
 			bintype='exe', csflags=['-pkg:gtk-sharp-2.0'], msg='Checking for Gtksharp support')
 """
 
-from waflib import Utils, Task, Options, Logs, Errors
+from waflib import Utils, Task, Options, Errors
 from waflib.TaskGen import before_method, after_method, feature
 from waflib.Tools import ccroot
 from waflib.Configure import conf

waflib/Tools/dbus.py

@@ -66,5 +66,5 @@ def configure(conf):
 	"""
 	Detect the program dbus-binding-tool and set the *conf.env.DBUS_BINDING_TOOL*
 	"""
-	dbus_binding_tool = conf.find_program('dbus-binding-tool', var='DBUS_BINDING_TOOL')
+	conf.find_program('dbus-binding-tool', var='DBUS_BINDING_TOOL')
 

waflib/Tools/errcheck.py

@@ -103,7 +103,6 @@ def replace(m):
 			if x in kw:
 				if x == 'iscopy' and 'subst' in getattr(self, 'features', ''):
 					continue
-				err = True
 				Logs.error('Fix the typo %r -> %r on %r' % (x, typos[x], ret))
 		return ret
 	setattr(Build.BuildContext, m, call)

waflib/Tools/fc_config.py

@@ -10,7 +10,6 @@ Fortran configuration helpers
 import re, os, sys, shlex
 from waflib.Configure import conf
 from waflib.TaskGen import feature, before_method
-from waflib import Utils
 
 FC_FRAGMENT = '        program main\n        end     program main\n'
 FC_FRAGMENT2 = '        PROGRAM MAIN\n        END\n' # what's the actual difference between these?

waflib/Tools/fc_scan.py

@@ -5,10 +5,6 @@
 
 import re
 
-from waflib import Utils, Task, TaskGen, Logs
-from waflib.TaskGen import feature, before_method, after_method, extension
-from waflib.Configure import conf
-
 INC_REGEX = """(?:^|['">]\s*;)\s*(?:|#\s*)INCLUDE\s+(?:\w+_)?[<"'](.+?)(?=["'>])"""
 USE_REGEX = """(?:^|;)\s*USE(?:\s+|(?:(?:\s*,\s*(?:NON_)?INTRINSIC)?\s*::))\s*(\w+)"""
 MOD_REGEX = """(?:^|;)\s*MODULE(?!\s*PROCEDURE)(?:\s+|(?:(?:\s*,\s*(?:NON_)?INTRINSIC)?\s*::))\s*(\w+)"""
@@ -82,7 +78,6 @@ class fortran_parser(object):
 		Process a single file in the search for dependencies, extract the files used
 		the modules used, and the modules provided.
 		"""
-		path = node.abspath()
 		incs, uses, mods = self.find_deps(node)
 		for x in incs:
 			if x in self.seen:

waflib/Tools/gcc.py

@@ -8,8 +8,6 @@
 gcc/llvm detection.
 """
 
-import os, sys
-from waflib import Configure, Options, Utils
 from waflib.Tools import ccroot, ar
 from waflib.Configure import conf
 

waflib/Tools/gdc.py

@@ -2,7 +2,6 @@
 # encoding: utf-8
 # Carlos Rafael Giani, 2007 (dv)
 
-import sys
 from waflib.Tools import ar, d
 from waflib.Configure import conf
 

waflib/Tools/glib2.py

@@ -13,7 +13,7 @@ Support for GLib2 tools:
 
 import os
 from waflib import Context, Task, Utils, Options, Errors, Logs
-from waflib.TaskGen import taskgen_method, before_method, after_method, feature, extension
+from waflib.TaskGen import taskgen_method, before_method, feature, extension
 from waflib.Configure import conf
 
 ################## marshal files
@@ -307,7 +307,7 @@ def process_settings(self):
 		if not bld.is_install: return
 		Logs.pprint ('YELLOW','Updating GSettings schema cache')
 		command = Utils.subst_vars("${GLIB_COMPILE_SCHEMAS} ${GSETTINGSSCHEMADIR}", bld.env)
-		ret = self.bld.exec_command(command)
+		self.bld.exec_command(command)
 
 	if self.bld.is_install:
 		if not self.env['GSETTINGSSCHEMADIR']:
@@ -317,7 +317,7 @@ def process_settings(self):
 			self.bld.install_files (self.env['GSETTINGSSCHEMADIR'], install_files)
 
 			if not hasattr(self.bld, '_compile_schemas_registered'):
-				self.bld.add_post_fun (compile_schemas_callback)
+				self.bld.add_post_fun(compile_schemas_callback)
 				self.bld._compile_schemas_registered = True
 
 class glib_validate_schema(Task.Task):

waflib/Tools/gxx.py

@@ -8,8 +8,6 @@
 g++/llvm detection.
 """
 
-import os, sys
-from waflib import Configure, Options, Utils
 from waflib.Tools import ccroot, ar
 from waflib.Configure import conf
 

waflib/Tools/icc.py

@@ -7,7 +7,7 @@
 Detect the Intel C compiler
 """
 
-import os, sys
+import sys
 from waflib.Tools import ccroot, ar, gcc
 from waflib.Configure import conf
 

waflib/Tools/icpc.py

@@ -6,7 +6,7 @@
 Detect the Intel C++ compiler
 """
 
-import os, sys
+import sys
 from waflib.Tools import ccroot, ar, gxx
 from waflib.Configure import conf
 

waflib/Tools/intltool.py

@@ -28,7 +28,7 @@ Usage of the :py:mod:`waflib.Tools.gnu_dirs` is recommended, but not obligatory.
 """
 
 import os, re
-from waflib import Configure, Context, TaskGen, Task, Utils, Runner, Options, Build, Logs
+from waflib import Context, Task, Utils, Logs
 import waflib.Tools.ccroot
 from waflib.TaskGen import feature, before_method, taskgen_method
 from waflib.Logs import error

waflib/Tools/irixcc.py

@@ -6,8 +6,6 @@ compiler definition for irix/MIPSpro cc compiler
 based on suncc.py from waf
 """
 
-import os
-from waflib import Utils
 from waflib.Tools import ccroot, ar
 from waflib.Configure import conf
 

waflib/Tools/javaw.py

@@ -26,8 +26,8 @@ You would have to run::
 [1] http://www.jython.org/
 """
 
-import os, re, tempfile, shutil
-from waflib import TaskGen, Task, Utils, Options, Build, Errors, Node, Logs
+import os, tempfile, shutil
+from waflib import Task, Utils, Errors, Node, Logs
 from waflib.Configure import conf
 from waflib.TaskGen import feature, before_method, after_method
 
@@ -69,8 +69,6 @@ def apply_java(self):
 		sourcepath='.', srcdir='.',
 		jar_mf_attributes={}, jar_mf_classpath=[])
 
-	nodes_lst = []
-
 	outdir = getattr(self, 'outdir', None)
 	if outdir:
 		if not isinstance(outdir, Node.Node):
@@ -194,7 +192,6 @@ def use_jar_files(self):
 	Process the *use* attribute to set the build order on the
 	tasks created by another task generator.
 	"""
-	lst = []
 	self.uselib = self.to_list(getattr(self, 'uselib', []))
 	names = self.to_list(getattr(self, 'use', []))
 	get = self.bld.get_tgen_by_name

waflib/Tools/kde4.py

@@ -6,9 +6,9 @@
 Support for the KDE4 libraries and msgfmt
 """
 
-import os, sys, re
-from waflib import Options, TaskGen, Task, Utils
-from waflib.TaskGen import feature, after_method
+import os, re
+from waflib import Task, Utils
+from waflib.TaskGen import feature
 
 @feature('msgfmt')
 def apply_msgfmt(self):

waflib/Tools/ldc2.py

@@ -2,7 +2,6 @@
 # encoding: utf-8
 # Alex Rønne Petersen, 2012 (alexrp/Zor)
 
-import sys
 from waflib.Tools import ar, d
 from waflib.Configure import conf
 

waflib/Tools/lua.py

@@ -16,7 +16,7 @@ Compile *.lua* files into *.luac*::
 """
 
 from waflib.TaskGen import extension
-from waflib import Task, Utils
+from waflib import Task
 
 @extension('.lua')
 def add_lua(self, node):

waflib/Tools/msvc.py

@@ -833,9 +833,6 @@ def find_msvc(conf):
 	v.MSVC_MANIFEST = (compiler == 'msvc' and version >= 8) or (compiler == 'wsdk' and version >= 6) or (compiler == 'intel' and version >= 11)
 
 	# compiler
-	cxx = None
-	if v['CXX']: cxx = v['CXX']
-	elif 'CXX' in conf.environ: cxx = conf.environ['CXX']
 	cxx = conf.find_program(compiler_name, var='CXX', path_list=path)
 
 	# before setting anything, check if the compiler is really msvc

waflib/Tools/nasm.py

@@ -19,7 +19,7 @@ def configure(conf):
 	"""
 	Detect nasm/yasm and set the variable *AS*
 	"""
-	nasm = conf.find_program(['nasm', 'yasm'], var='AS')
+	conf.find_program(['nasm', 'yasm'], var='AS')
 	conf.env.AS_TGT_F = ['-o']
 	conf.env.ASLNK_TGT_F = ['-o']
 	conf.load('asm')

waflib/Tools/ruby.py

@@ -23,8 +23,8 @@ Support for Ruby extensions. A C/C++ compiler is required::
 """
 
 import os
-from waflib import Task, Options, Utils
-from waflib.TaskGen import before_method, feature, after_method, Task, extension
+from waflib import Options, Utils, Task
+from waflib.TaskGen import before_method, feature, extension
 from waflib.Configure import conf
 
 @feature('rubyext')
@@ -103,7 +103,6 @@ def check_ruby_ext_devel(self):
 	def read_config(key):
 		return read_out('puts RbConfig::CONFIG[%r]' % key)
 
-	ruby = self.env['RUBY']
 	cpppath = archdir = read_config('archdir')
 
 	if version >= (1, 9, 0):
@@ -166,18 +165,18 @@ def check_ruby_module(self, module_name):
 
 @extension('.rb')
 def process(self, node):
-	tsk = self.create_task('run_ruby', node)
+	return self.create_task('run_ruby', node)
 
 class run_ruby(Task.Task):
 	"""
 	Task to run ruby files detected by file extension .rb::
-	
+
 		def options(opt):
 			opt.load('ruby')
-		
+
 		def configure(ctx):
 			ctx.check_ruby_version()
-		
+
 		def build(bld):
 			bld.env['RBFLAGS'] = '-e puts "hello world"'
 			bld(source='a_ruby_file.rb')

waflib/Tools/tex.py

@@ -383,7 +383,7 @@ class tex(Task.Task):
 
 	def hash_aux_nodes(self):
 		try:
-			nodes = self.aux_nodes
+			self.aux_nodes
 		except AttributeError:
 			try:
 				self.aux_nodes = self.scan_aux(self.inputs[0].change_ext('.aux'))
@@ -430,7 +430,6 @@ def apply_tex(self):
 	if not getattr(self, 'type', None) in ('latex', 'pdflatex', 'xelatex'):
 		self.type = 'pdflatex'
 
-	tree = self.bld
 	outs = Utils.to_list(getattr(self, 'outs', []))
 
 	# prompt for incomplete files (else the batchmode is used)

waflib/extras/bjam.py

@@ -2,7 +2,6 @@
 # per rosengren 2011
 
 from os import sep, readlink
-from os.path import abspath
 from waflib import Logs
 from waflib.TaskGen import feature, after_method
 from waflib.Task import Task, always_run
@@ -48,8 +47,6 @@ class bjam_creator(Task):
 	def run(self):
 		env = self.env
 		gen = self.generator
-		path = gen.path
-		bld = gen.bld
 		bjam = gen.bld.root.find_dir(env.BJAM_SRC)
 		if not bjam:
 			Logs.error('Can not find bjam source')

waflib/extras/blender.py

@@ -20,7 +20,6 @@ Use ./waf configure --system to set the installation directory to system path
 """
 import os
 import re
-from sys import platform as _platform
 from getpass import getuser
 
 from waflib import Utils

waflib/extras/c_bgxlc.py

@@ -6,7 +6,6 @@
 IBM XL Compiler for Blue Gene
 """
 
-import os
 from waflib.Tools import ccroot,ar
 from waflib.Configure import conf
 

waflib/extras/c_dumbpreproc.py

@@ -23,9 +23,7 @@ To use::
 		conf.load('c_dumbpreproc')
 """
 
-import re, sys, os, string, traceback
-from waflib import Logs, Build, Utils, Errors
-from waflib.Logs import debug, error
+import re
 from waflib.Tools import c_preproc
 
 re_inc = re.compile(

waflib/extras/c_nec.py

@@ -6,7 +6,6 @@
 NEC SX Compiler for SX vector systems
 """
 
-import os
 import re
 from waflib import Utils
 from waflib.Tools import ccroot,ar

waflib/extras/cabal.py

@@ -3,12 +3,8 @@
 # Anton Feldmann, 2012
 # "Base for cabal"
 
-import re
-import time
-from waflib import TaskGen, Task, Utils
-from waflib.Configure import conf
-from waflib.Task import always_run
-from waflib.TaskGen import extension, feature, after, before, before_method
+from waflib import Task, Utils
+from waflib.TaskGen import extension
 from waflib.Utils import threading
 from shutil import rmtree
 

waflib/extras/cfg_altoptions.py

@@ -33,7 +33,7 @@ Known issues:
 
 import os
 import functools
-from waflib import Task, Utils, TaskGen, Configure, Options, Errors
+from waflib import Configure, Options, Errors
 
 def name_to_dest(x):
 	return x.lower().replace('-', '_')

waflib/extras/cppcheck.py

@@ -83,7 +83,7 @@ The generation of the html report is originally based on the cppcheck-htmlreport
 script that comes shipped with the cppcheck tool.
 """
 
-import os, sys
+import sys
 import xml.etree.ElementTree as ElementTree
 from waflib import Task, TaskGen, Logs, Context
 

waflib/extras/cpplint.py

@@ -47,7 +47,7 @@ When using this tool, the wscript will look like:
 import sys, re
 import logging
 import threading
-from waflib import Task, Build, TaskGen, Logs, Utils
+from waflib import Task, TaskGen, Logs
 try:
     from cpplint.cpplint import ProcessFile, _cpplint_state
 except ImportError:

waflib/extras/cython.py

@@ -2,12 +2,9 @@
 # encoding: utf-8
 # Thomas Nagy, 2010-2015
 
-import os,re
-
-import waflib
-import waflib.Logs as _msg
+import os, re
 from waflib import Task, Logs
-from waflib.TaskGen import extension, feature, before_method, after_method
+from waflib.TaskGen import extension
 
 cy_api_pat = re.compile(r'\s*?cdef\s*?(public|api)\w*')
 re_cyt = re.compile(r"""
@@ -95,7 +92,7 @@ class cython(Task.Task):
 			else:
 				mods.append(m.group(2))
 
-		_msg.debug("cython: mods %r" % mods)
+		Logs.debug("cython: mods %r" % mods)
 		incs = getattr(self.generator, 'cython_includes', [])
 		incs = [self.generator.path.find_dir(x) for x in incs]
 		incs.append(node.parent)
@@ -116,7 +113,7 @@ class cython(Task.Task):
 		if implicit:
 			found.append(implicit)
 
-		_msg.debug("cython: found %r" % found)
+		Logs.debug("cython: found %r" % found)
 
 		# Now the .h created - store them in bld.raw_deps for later use
 		has_api = False

waflib/extras/dcc.py

@@ -2,30 +2,29 @@
 # encoding: utf-8
 # Jérôme Carretero, 2011 (zougloub)
 
-from waflib import Configure, Options, Utils
+from waflib import Options
 from waflib.Tools import ccroot
 from waflib.Configure import conf
 
 @conf
 def find_dcc(conf):
-	cc = conf.find_program(['dcc'], var='CC', path_list=getattr(Options.options, 'diabbindir', ""))
+	conf.find_program(['dcc'], var='CC', path_list=getattr(Options.options, 'diabbindir', ""))
 	conf.env.CC_NAME = 'dcc'
 
 @conf
 def find_dld(conf):
-	ld = conf.find_program(['dld'], var='LINK_CC', path_list=getattr(Options.options, 'diabbindir', ""))
+	conf.find_program(['dld'], var='LINK_CC', path_list=getattr(Options.options, 'diabbindir', ""))
 	conf.env.LINK_CC_NAME = 'dld'
 
 @conf
 def find_dar(conf):
-	ar = conf.find_program(['dar'], var='DAR', path_list=getattr(Options.options, 'diabbindir', ""))
-	conf.env.AR = ar
+	conf.find_program(['dar'], var='AR', path_list=getattr(Options.options, 'diabbindir', ""))
 	conf.env.AR_NAME = 'dar'
 	conf.env.ARFLAGS = 'rcs'
 
 @conf
 def find_ddump(conf):
-	prg = conf.find_program(['ddump'], var='DDUMP', path_list=getattr(Options.options, 'diabbindir', ""))
+	conf.find_program(['ddump'], var='DDUMP', path_list=getattr(Options.options, 'diabbindir', ""))
 
 @conf
 def dcc_common_flags(conf):

waflib/extras/doxygen.py

@@ -26,9 +26,8 @@ When using this tool, the wscript will look like:
 			bld(features="doxygen", doxyfile='Doxyfile', ...)
 """
 
-from fnmatch import fnmatchcase
-import os, os.path, re, stat
-from waflib import Task, Utils, Node, Logs, Errors
+import os, os.path, re
+from waflib import Task, Utils, Node
 from waflib.TaskGen import feature
 
 DOXY_STR = '"${DOXYGEN}" - '

waflib/extras/eclipse.py

@@ -14,7 +14,7 @@ $ waf configure eclipse
 """
 
 import sys, os
-from waflib import Utils, Logs, Context, Options, Build, TaskGen, Scripting
+from waflib import Utils, Logs, Context, Build, TaskGen, Scripting
 from xml.dom.minidom import Document
 
 STANDARD_INCLUDES = [ '/usr/local/include', '/usr/include' ]
@@ -64,18 +64,16 @@ class eclipse(Build.BuildContext):
 				if not getattr(tg, 'link_task', None):
 					continue
 
-				l = Utils.to_list(getattr(tg, "includes", ''))
-				sources = Utils.to_list(getattr(tg, 'source', ''))
+				#l = Utils.to_list(getattr(tg, "includes", ''))
+				#sources = Utils.to_list(getattr(tg, 'source', ''))
 				features = Utils.to_list(getattr(tg, 'features', ''))
 
 				is_cc = 'c' in features or 'cxx' in features
 
-				bldpath = tg.path.bldpath()
-
-				base = os.path.normpath(os.path.join(self.bldnode.name, tg.path.srcpath()))
-
-				if is_cc:
-					sources_dirs = set([src.parent for src in tg.to_nodes(sources)])
+				#bldpath = tg.path.bldpath()
+				#base = os.path.normpath(os.path.join(self.bldnode.name, tg.path.srcpath()))
+				#if is_cc:
+				#	sources_dirs = set([src.parent for src in tg.to_nodes(sources)])
 
 				incnodes = tg.to_incnodes(tg.to_list(getattr(tg, 'includes', [])) + tg.env['INCLUDES'])
 				for p in incnodes:
@@ -156,11 +154,9 @@ class eclipse(Build.BuildContext):
 			GASErrorParser
 			GLDErrorParser
 		""".split()
-		ext = self.add(doc, extensions, 'extension',
-					{'id': cdt_core + '.ELF', 'point':cdt_core + '.BinaryParser'})
+		self.add(doc, extensions, 'extension', {'id': cdt_core + '.ELF', 'point':cdt_core + '.BinaryParser'})
 		for e in extension_list:
-			ext = self.add(doc, extensions, 'extension',
-					{'id': cdt_core + '.' + e, 'point':cdt_core + '.ErrorParser'})
+			self.add(doc, extensions, 'extension', {'id': cdt_core + '.' + e, 'point':cdt_core + '.ErrorParser'})
 
 		storageModule = self.add(doc, cconf, 'storageModule',
 				{'moduleId': 'cdtBuildSystem', 'version': '4.0.0'})
@@ -178,23 +174,21 @@ class eclipse(Build.BuildContext):
 				 'resourceTypeBasedDiscovery': 'false',
 				 'superClass': cdt_bld + '.prefbase.toolchain'})
 
-		targetPlatform = self.add(doc, toolChain, 'targetPlatform',
-				{ 'binaryParser': 'org.eclipse.cdt.core.ELF',
-				  'id': cdt_bld + '.prefbase.toolchain.1', 'name': ''})
+		self.add(doc, toolChain, 'targetPlatform', {'binaryParser': 'org.eclipse.cdt.core.ELF', 'id': cdt_bld + '.prefbase.toolchain.1', 'name': ''})
 
 		waf_build = '"%s" %s'%(waf, eclipse.fun)
 		waf_clean = '"%s" clean'%(waf)
-		builder = self.add(doc, toolChain, 'builder',
-						{'autoBuildTarget': waf_build,
-						 'command': executable,
-						 'enableAutoBuild': 'false',
-						 'cleanBuildTarget': waf_clean,
-						 'enableIncrementalBuild': 'true',
-						 'id': cdt_bld + '.settings.default.builder.1',
-						 'incrementalBuildTarget': waf_build,
-						 'managedBuildOn': 'false',
-						 'name': 'Gnu Make Builder',
-						 'superClass': cdt_bld + '.settings.default.builder'})
+		self.add(doc, toolChain, 'builder',
+					{'autoBuildTarget': waf_build,
+					 'command': executable,
+					 'enableAutoBuild': 'false',
+					 'cleanBuildTarget': waf_clean,
+					 'enableIncrementalBuild': 'true',
+					 'id': cdt_bld + '.settings.default.builder.1',
+					 'incrementalBuildTarget': waf_build,
+					 'managedBuildOn': 'false',
+					 'name': 'Gnu Make Builder',
+					 'superClass': cdt_bld + '.settings.default.builder'})
 
 		for tool_name in ("Assembly", "GNU C++", "GNU C"):
 			tool = self.add(doc, toolChain, 'tool',
@@ -250,8 +244,7 @@ class eclipse(Build.BuildContext):
 							{'moduleId': 'cdtBuildSystem',
 							 'version': '4.0.0'})
 
-		project = self.add(doc, storageModule, 'project',
-					{'id': '%s.null.1'%appname, 'name': appname})
+		self.add(doc, storageModule, 'project', {'id': '%s.null.1'%appname, 'name': appname})
 
 		doc.appendChild(cproject)
 		return doc

waflib/extras/fc_bgxlf.py

@@ -2,7 +2,6 @@
 # encoding: utf-8
 # harald at klimachs.de
 
-import re
 from waflib.Tools import fc, fc_config, fc_scan
 from waflib.Configure import conf
 

waflib/extras/fc_cray.py

@@ -3,7 +3,6 @@
 # harald at klimachs.de
 
 import re
-from waflib import Utils
 from waflib.Tools import fc, fc_config, fc_scan
 from waflib.Configure import conf
 

waflib/extras/fc_nec.py

@@ -3,7 +3,6 @@
 # harald at klimachs.de
 
 import re
-from waflib import Utils
 from waflib.Tools import fc, fc_config, fc_scan
 from waflib.Configure import conf
 

waflib/extras/fc_pgfortran.py

@@ -3,7 +3,6 @@
 # harald at klimachs.de
 
 import re
-from waflib import Utils
 from waflib.Tools import fc, fc_config, fc_scan
 from waflib.Configure import conf
 

waflib/extras/file_to_object.py

@@ -34,9 +34,7 @@ Known issues:
 """
 
 import os, binascii
-
-from waflib import Task, Utils, TaskGen, Errors
-
+from waflib import Task, TaskGen, Errors
 
 def filename_c_escape(x):
 	return x.replace("\\", "\\\\")
@@ -135,12 +133,12 @@ def tg_file_to_object(self):
 	for src in sources:
 		if bld.env.F2O_METHOD == ["asm"]:
 			tgt = src.parent.find_or_declare(src.name + '.f2o.s')
-			task = self.create_task('file_to_object_s',
-			 src, tgt, cwd=src.parent.abspath())
+			tsk = self.create_task('file_to_object_s', src, tgt)
+			tsk.cwd = src.parent.abspath() # verify
 		else:
 			tgt = src.parent.find_or_declare(src.name + '.f2o.c')
-			task = self.create_task('file_to_object_c',
-			 src, tgt, cwd=src.parent.abspath())
+			tsk = self.create_task('file_to_object_c', src, tgt)
+			tsk.cwd = src.parent.abspath() # verify
 		targets.append(tgt)
 	self.source = targets
 

waflib/extras/fluid.py

@@ -15,7 +15,7 @@ class fluid(Task.Task):
 	run_str = '${FLUID} -c -o ${TGT[0].abspath()} -h ${TGT[1].abspath()} ${SRC}'
 
 @extension('.fl')
-def fluid(self, node):
+def process_fluid(self, node):
 	"""add the .fl to the source list; the cxx file generated will be compiled when possible"""
 	cpp = node.change_ext('.cpp')
 	hpp = node.change_ext('.hpp')

waflib/extras/fsc.py

@@ -8,10 +8,9 @@ Experimental F# stuff
 FSC="mono /path/to/fsc.exe" waf configure build
 """
 
-from waflib import Utils, Task, Options, Logs, Errors
+from waflib import Utils, Task
 from waflib.TaskGen import before_method, after_method, feature
 from waflib.Tools import ccroot, cs
-from waflib.Configure import conf
 
 ccroot.USELIB_VARS['fsc'] = set(['CSFLAGS', 'ASSEMBLIES', 'RESOURCES'])
 

waflib/extras/gccdeps.py

@@ -107,7 +107,6 @@ def post_run(self):
 	txt = txt.replace('\\\n', '')
 
 	val = txt.strip()
-	lst = val.split(':')
 	val = [x.replace('\\ ', ' ') for x in re_splitter.split(val) if x]
 
 	nodes = []

waflib/extras/go.py

@@ -144,7 +144,6 @@ def compile_go(self, node):
 	#print ('compile_go-cgo...')
 	bld_dir = node.parent.get_bld()
 	obj_dir = bld_dir.make_node('_obj')
-	target  = obj_dir.make_node(node.change_ext('.a').name)
 	return self.create_task('cgopackage', node, node.change_ext('.a'))
 
 @feature('gopackage', 'goprogram', 'cgopackage')

waflib/extras/make.py

@@ -15,7 +15,7 @@ It is likely to break in the following cases:
 """
 
 import re
-from waflib import Options, Task, Logs
+from waflib import Options, Task
 from waflib.Build import BuildContext
 
 class MakeContext(BuildContext):

waflib/extras/md5_tstamp.py

@@ -16,8 +16,6 @@ this hashing scheme
 """
 
 import os, stat
-try: import cPickle
-except: import pickle as cPickle
 from waflib import Utils, Build, Context
 
 STRONGEST = True

waflib/extras/midl.py

@@ -55,7 +55,7 @@ def idl_file(self):
 		c = node.change_ext('_i.c')
 		p = node.change_ext('_p.c')
 		d = node.parent.find_or_declare('dlldata.c')
-		tsk = self.create_task('midl', node, [t, h, c, p, d])
+		self.create_task('midl', node, [t, h, c, p, d])
 
 	self.source = src_nodes
 

waflib/extras/misc.py

@@ -12,7 +12,7 @@ Try using:
 """
 
 import shutil, re, os
-from waflib import TaskGen, Node, Task, Utils, Build, Errors
+from waflib import Node, Task, Utils, Errors
 from waflib.TaskGen import feature, after_method, before_method
 from waflib.Logs import debug
 
@@ -27,7 +27,6 @@ def copy_attrs(orig, dest, names, only_if_set=False):
 
 def copy_func(tsk):
 	"Make a file copy. This might be used to make other kinds of file processing (even calling a compiler is possible)"
-	env = tsk.env
 	infile = tsk.inputs[0].abspath()
 	outfile = tsk.outputs[0].abspath()
 	try:
@@ -323,7 +322,6 @@ use command_is_external=True''') % (self.command,)
 	if self.cwd is None:
 		cwd = None
 
-	args = []
 	inputs = []
 	outputs = []
 

waflib/extras/objcopy.py

@@ -24,7 +24,7 @@ class objcopy(Task.Task):
 
 @feature('objcopy')
 @after_method('apply_link')
-def objcopy(self):
+def map_objcopy(self):
 	def_attrs(self,
 	   objcopy_bfdname = 'ihex',
 	   objcopy_target = None,
@@ -34,9 +34,7 @@ def objcopy(self):
 	link_output = self.link_task.outputs[0]
 	if not self.objcopy_target:
 		self.objcopy_target = link_output.change_ext('.' + self.objcopy_bfdname).name
-	task = self.create_task('objcopy',
-							src=link_output,
-							tgt=self.path.find_or_declare(self.objcopy_target))
+	task = self.create_task('objcopy', src=link_output, tgt=self.path.find_or_declare(self.objcopy_target))
 
 	task.env.append_unique('TARGET_BFDNAME', self.objcopy_bfdname)
 	try:
@@ -50,5 +48,5 @@ def objcopy(self):
 							   env=task.env.derive())
 
 def configure(ctx):
-	objcopy = ctx.find_program('objcopy', var='OBJCOPY', mandatory=True)
+	ctx.find_program('objcopy', var='OBJCOPY', mandatory=True)
 

waflib/extras/parallel_debug.py

@@ -12,7 +12,7 @@ a file named pdebug.svg in the source directory::
 		...
 """
 
-import os, time, sys, re
+import time, sys, re
 try: from Queue import Queue
 except: from queue import Queue
 from waflib import Runner, Options, Utils, Task, Logs, Errors

waflib/extras/pep8.py

@@ -24,7 +24,7 @@ def run_pep8(self, node):
 '''
 
 import threading
-from waflib import TaskGen, Task, Options
+from waflib import Task, Options
 
 pep8 = __import__('pep8')
 

waflib/extras/pgicxx.py

@@ -6,8 +6,6 @@
 Detect the PGI C++ compiler
 """
 
-import sys, re
-from waflib.Configure import conf
 from waflib.Tools.compiler_cxx import cxx_compiler
 cxx_compiler['linux'].append('pgicxx')
 

waflib/extras/preforkjava.py

@@ -4,11 +4,7 @@
 
 # TODO: have the child process terminate if the parent is killed abruptly
 
-import os, re, socket, threading, sys, subprocess, time, atexit, traceback, random
-try:
-	import SocketServer
-except ImportError:
-	import socketserver as SocketServer
+import os, socket, threading, sys, subprocess, time, atexit, random
 try:
 	from queue import Queue
 except ImportError:
@@ -84,7 +80,7 @@ if 1:
 		global SERVERS
 		while SERVERS:
 			srv = SERVERS.pop()
-			pid = srv.pid
+			#pid = srv.pid
 			try:
 				srv.kill()
 			except Exception as e:

waflib/extras/proc.py

@@ -23,7 +23,6 @@ def configure(cnf):
 def proc(tsk):
 	env = tsk.env
 	gen = tsk.generator
-	bld = gen.bld
 	inc_nodes = gen.to_incnodes(Utils.to_list(getattr(gen,'includes',[])) + env['INCLUDES'])
 
 	# FIXME the if-else construct will not work in python 2

waflib/extras/relocation.py

@@ -15,7 +15,7 @@ files in that directory will change, causing a partial build.
 
 import os
 from waflib import Build, ConfigSet, Task, Utils, Errors
-from waflib.TaskGen import feature, before_method, after_method
+from waflib.TaskGen import feature, after_method
 
 EXTRA_LOCK = '.old_srcdir'
 

waflib/extras/rst.py

@@ -30,7 +30,7 @@ This tool is experimental; don't hesitate to contribute to it.
 
 """
 
-import os, re
+import re
 from waflib import Node, Utils, Task, Errors, Logs
 from waflib.TaskGen import feature, before_method
 

waflib/extras/sas.py

@@ -4,8 +4,8 @@
 
 "SAS support"
 
-import os, re
-from waflib import Utils, Task, TaskGen, Runner, Build, Errors, Node, Logs
+import os
+from waflib import Task, Errors, Logs
 from waflib.TaskGen import feature, before_method
 
 sas_fun, _ = Task.compile_fun('sas -sysin ${SRCFILE} -log ${LOGFILE} -print ${LSTFILE}', shell=False)
@@ -14,9 +14,6 @@ class sas(Task.Task):
 	vars = ['SAS', 'SASFLAGS']
 	def run(task):
 		command = 'SAS'
-		env = task.env
-		bld = task.generator.bld
-
 		fun = sas_fun
 
 		node = task.inputs[0]

waflib/extras/scala.py

@@ -8,9 +8,8 @@ Scala support
 scalac outputs files a bit where it wants to
 """
 
-import os, re
-from waflib.Configure import conf
-from waflib import TaskGen, Task, Utils, Options, Build, Errors, Node
+import os
+from waflib import Task, Utils, Node
 from waflib.TaskGen import feature, before_method, after_method
 
 from waflib.Tools import ccroot
@@ -26,8 +25,6 @@ def apply_scalac(self):
 		sourcepath='.', srcdir='.',
 		jar_mf_attributes={}, jar_mf_classpath=[])
 
-	nodes_lst = []
-
 	outdir = getattr(self, 'outdir', None)
 	if outdir:
 		if not isinstance(outdir, Node.Node):

waflib/extras/ticgt.py

@@ -32,28 +32,27 @@ TODO:
 
 import os, re
 
-from waflib import Configure, Options, Utils, Task, TaskGen
+from waflib import Options, Utils, Task, TaskGen
 from waflib.Tools import c, ccroot, c_preproc
 from waflib.Configure import conf
-from waflib.TaskGen import feature, before_method, taskgen_method
-from waflib.Tools.ccroot import link_task, stlink_task
+from waflib.TaskGen import feature, before_method
 from waflib.Tools.c import cprogram
 
 opj = os.path.join
 
 @conf
 def find_ticc(conf):
-	cc = conf.find_program(['cl6x'], var='CC', path_list=opj(getattr(Options.options, 'ti-cgt-dir', ""), 'bin'))
+	conf.find_program(['cl6x'], var='CC', path_list=opj(getattr(Options.options, 'ti-cgt-dir', ""), 'bin'))
 	conf.env.CC_NAME = 'ticc'
 
 @conf
 def find_tild(conf):
-	ld = conf.find_program(['lnk6x'], var='LINK_CC', path_list=opj(getattr(Options.options, 'ti-cgt-dir', ""), 'bin'))
+	conf.find_program(['lnk6x'], var='LINK_CC', path_list=opj(getattr(Options.options, 'ti-cgt-dir', ""), 'bin'))
 	conf.env.LINK_CC_NAME = 'tild'
 
 @conf
 def find_tiar(conf):
-	ar = conf.find_program(['ar6x'], var='AR', path_list=opj(getattr(Options.options, 'ti-cgt-dir', ""), 'bin'))
+	conf.find_program(['ar6x'], var='AR', path_list=opj(getattr(Options.options, 'ti-cgt-dir', ""), 'bin'))
 	conf.env.AR_NAME = 'tiar'
 	conf.env.ARFLAGS = 'qru'
 

waflib/extras/unity.py

@@ -52,9 +52,9 @@ def make_batch_fun(ext):
 
 def enable_support(cc, cxx):
 	if cxx or not cc:
-		make_cxx_batch = TaskGen.extension('.cpp', '.cc', '.cxx', '.C', '.c++')(make_batch_fun('cxx'))
+		TaskGen.extension('.cpp', '.cc', '.cxx', '.C', '.c++')(make_batch_fun('cxx'))
 	if cc:
-		make_c_batch = TaskGen.extension('.c')(make_batch_fun('c'))
+		TaskGen.extension('.c')(make_batch_fun('c'))
 	else:
 		TaskGen.task_gen.mappings['.c'] = TaskGen.task_gen.mappings['.cpp']
 

waflib/extras/valadoc.py

@@ -7,8 +7,8 @@ ported from waf 1.5:
 TODO: tabs vs spaces
 """
 
-from waflib import Task, Utils, Node, Errors, Logs
-from waflib.TaskGen import feature, extension, after_method
+from waflib import Task, Utils, Errors, Logs
+from waflib.TaskGen import feature
 
 VALADOC_STR = '${VALADOC}'
 

waflib/extras/win32_opts.py

@@ -8,11 +8,7 @@ This module can help reducing the overhead of listing files on windows (more tha
 """
 
 import os
-try:
-	import cPickle
-except ImportError:
-	import pickle as cPickle
-from waflib import Utils, Build, Context, Node, Logs
+from waflib import Utils, Build, Node, Logs
 
 try:
 	TP = '%s\\*'.decode('ascii')

waflib/extras/xcode.py

@@ -15,7 +15,7 @@ $ waf configure xcode
 # TODO: support iOS projects
 
 from waflib import Context, TaskGen, Build, Utils
-import os, sys, random, time
+import os, sys
 
 HEADERS_GLOB = '**/(*.h|*.hpp|*.H|*.inl)'