fix pyflakes warnings in figleaf

diff --git a/src/allmydata/util/figleaf.py b/src/allmydata/util/figleaf.py
index 5a3b1fb302eb86be3a314b4af5494721dd17cc41..38045ef4b3ddeecae47c7fd549c92ea45d4de2d3 100644 (file)
--- a/src/allmydata/util/figleaf.py
+++ b/src/allmydata/util/figleaf.py
@@ -60,12 +60,12 @@ import os
 import threading
 from cPickle import dump, load
 
-# import builtin sets if in > 2.4, otherwise use 'sets' module.
-if 'set' not in dir(__builtins__):
-    from sets import Set as set
+### import builtin sets if in > 2.4, otherwise use 'sets' module.
+# we require 2.4 or later
+assert set
 
 
-from token import *
+from token import tok_name, NEWLINE, STRING, INDENT, DEDENT, COLON
 import parser, types, symbol
 
 def get_token_name(x):
@@ -355,7 +355,7 @@ def get_info():
 #############
 
 def display_ast():
-    l = figleaf._LineGrabber(open(sys.argv[1]))
+    l = LineGrabber(open(sys.argv[1]))
     l.pretty_print()
 
 def main():

diff --git a/src/allmydata/util/figleaf_htmlizer.py b/src/allmydata/util/figleaf_htmlizer.py
index 919fbbe967361add308bcbdca0e3d8aed79449b7..3e0c263ccd76c2baf85b68cbde0c07693a381f86 100644 (file)
--- a/src/allmydata/util/figleaf_htmlizer.py
+++ b/src/allmydata/util/figleaf_htmlizer.py
@@ -1,7 +1,6 @@
 #! /usr/bin/env python
 import sys
 import figleaf
-from cPickle import load
 import os
 import re