Makefile, setup.py: add more source files to pyflakes target and fix their warnings.

diff --git a/Makefile b/Makefile
index c575ac5c240028475b9816187171f4bac97543f7..52f45b3e99fe96d5e2e2fc376b58cce9aa7f2b49 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -157,7 +157,7 @@ endif
 
 
 pyflakes:
-       $(PYTHON) -OOu `which pyflakes` src/allmydata static misc/build_helpers bin/tahoe-script.template |sort |uniq
+       $(PYTHON) -OOu `which pyflakes` src/allmydata static misc/build_helpers bin/tahoe-script.template twisted setup.py |sort |uniq
 check-umids:
        $(PYTHON) misc/coding_tools/check-umids.py `find src/allmydata -name '*.py'`
 

diff --git a/setup.py b/setup.py
index 786858e363dd114c2deaba396756eeb7eae32d8f..cd20d9d90b5e52aa22e88ce597aa1a06cd5af44b 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@
 #
 # See the docs/about.html file for licensing information.
 
-import glob, os, shutil, stat, subprocess, sys, zipfile, re
+import glob, os, stat, subprocess, sys, re
 
 ##### sys.path management