make pylint a bit happier

mnot · mnot · commit 275ff707e288 · 2011-05-14T20:55:46.000+10:00
diff --git a/bin/redbot b/bin/redbot
@@ -28,14 +28,15 @@ THE SOFTWARE.
 """
 
 import sys
-assert sys.version_info[0] == 2 and sys.version_info[1] >= 5, "Please use Python 2.5 or greater"
+assert sys.version_info[0] == 2 and sys.version_info[1] >= 5, \
+    "Please use Python 2.5 or greater"
 
 from optparse import OptionParser
 
 import nbhttp
 from redbot import droid
 from redbot.formatter import find_formatter, available_formatters
-import redbot.speak as rs
+
 
 lang = "en"  # TODO: add as CL option
 charset = "utf-8"
diff --git a/bin/webui.py b/bin/webui.py
@@ -43,7 +43,7 @@
     "Please use Python 2.5 or greater"
 
 import nbhttp
-from redbot import droid, fetch
+from redbot import droid
 from redbot.formatter import find_formatter, html
 
 ### Configuration ##########################################################
@@ -90,6 +90,7 @@
 except:
     locale.setlocale(locale.LC_ALL, '')
 
+
 class RedWebUi(object):
     """
     A Web UI for RED.
@@ -123,8 +124,8 @@ def __init__(self, base_uri, method, query_string, output_hdrs):
         else:
             self.show_default()
 
-    def output_hdrs(self, *args):
-        (output_body, body_done) = self._output_hdrs(*args)
+    def output_hdrs(self, *rgs):
+        (output_body, body_done) = self._output_hdrs(*rgs)
         self.output_body = output_body
         def remove_timeout():
             self.timeout.delete()
@@ -198,6 +199,7 @@ def load_saved_test(self):
             return
         finally:
             fd.close()
+            
         formatter = find_formatter(self.format, 'html', self.descend)(
             self.base_uri, ired.uri, ired.orig_req_hdrs, lang,
             self.output, allow_save=(not is_saved), is_saved=True,
@@ -319,7 +321,7 @@ def except_handler(etype=None, evalue=None, etb=None):
         import cgitb
         out(cgitb.reset())
         if logdir is None:
-                out(error_template % """
+            out(error_template % """
     A problem has occurred, but it probably isn't your fault.
     """)
         else:
diff --git a/lib/cache_check.py b/lib/cache_check.py
@@ -27,7 +27,7 @@
 THE SOFTWARE.
 """
 
-from redbot.response_analyse import relative_time
+from redbot.response_analyse import relative_time, f_num
 import redbot.speak as rs
 
 ### configuration
@@ -46,7 +46,7 @@ def checkCaching(state):
     ]
 
     cc_set = state.parsed_hdrs.get('cache-control', [])
-    cc_list = [k for (k,v) in cc_set]
+    cc_list = [k for (k, v) in cc_set]
     cc_dict = dict(cc_set)
     cc_keys = cc_dict.keys()
 
diff --git a/lib/droid.py b/lib/droid.py
@@ -36,7 +36,6 @@
 """
 
 import re
-from cgi import escape as e
 from urlparse import urljoin
 
 import redbot.speak as rs
@@ -147,9 +146,9 @@ def process_link(self, link, tag, title):
 
 if "__main__" == __name__:
     import sys
-    uri = sys.argv[1]
+    test_uri = sys.argv[1]
     def status_p(msg):
         print msg
-    red = InspectingResourceExpertDroid(uri, status_cb=status_p)
+    red = InspectingResourceExpertDroid(test_uri, status_cb=status_p)
     red.run()
-    print red.messages
+    print red.state.messages
diff --git a/lib/fetch.py b/lib/fetch.py
@@ -71,6 +71,7 @@ def __init__(self, iri, method="GET", req_hdrs=None, req_body=None,
         self.state = RedState(iri, method, req_hdrs, req_body, req_type)
         self.status_cb = status_cb
         self.body_procs = body_procs or []
+        self.client = None
         self.done_cb = None
         self.outstanding_tasks = 0
         self._md5_processor = hashlib.md5()
@@ -323,14 +324,14 @@ def _read_gzip_header(content):
 if "__main__" == __name__:
     import sys
     uri = sys.argv[1]
-    req_hdrs = [('Accept-Encoding', 'gzip')]
+    test_req_hdrs = [('Accept-Encoding', 'gzip')]
     def status_p(msg):
         print msg
     class TestFetcher(RedFetcher):
         def done(self):
             print self.state.messages
     tf = TestFetcher(
-        uri, req_hdrs=req_hdrs, status_cb=status_p, req_type='test'
+        uri, req_hdrs=test_req_hdrs, status_cb=status_p, req_type='test'
     )
     tf.run()
     nbhttp.run()
diff --git a/lib/link_parse.py b/lib/link_parse.py
@@ -29,7 +29,6 @@
 
 from htmlentitydefs import entitydefs
 from HTMLParser import HTMLParser
-from urlparse import urljoin
 
 from redbot import response_analyse
 from redbot.response_analyse import ResponseHeaderParser as RHP
@@ -118,7 +117,8 @@ def handle_starttag(self, tag, attrs):
                 self.process_link(target, tag, title)
         elif tag == 'base':
             self.base = attr_d.get('href', self.base)
-        elif tag == 'meta' and attr_d.get('http-equiv', '').lower() == 'content-type':
+        elif tag == 'meta' and \
+          attr_d.get('http-equiv', '').lower() == 'content-type':
             ct = attr_d.get('content', None)
             if ct:
                 try:
@@ -127,7 +127,9 @@ def handle_starttag(self, tag, attrs):
                     media_type, params = ct, ''
                 media_type = media_type.lower()
                 param_dict = {}
-                for param in RHP._splitString(params, response_analyse.PARAMETER, "\s*;\s*"):
+                for param in RHP._splitString(
+                    params, response_analyse.PARAMETER, "\s*;\s*"
+                ):
                     try:
                         a, v = param.split("=", 1)
                         param_dict[a.lower()] = RHP._unquoteString(v)
@@ -146,7 +148,9 @@ def error(self, message):
         if self.getpos() == self.last_err_pos:
             # we're in a loop; give up.
             if self.err:
-                self.err("giving up on link parsing after %s errors" % self.errors)
+                self.err(
+                    "giving up on link parsing after %s errors" % self.errors
+                )
             self.ok = False
             raise BadErrorIReallyMeanIt()
         else:
diff --git a/lib/response_analyse.py b/lib/response_analyse.py
@@ -202,9 +202,9 @@ def __init__(self, red):
                 if parsed_value != None:
                     self.red.parsed_hdrs[nn] = parsed_value
 
-    def setMessage(self, name, msg, **vars):
+    def setMessage(self, name, msg, **kw):
         ident = 'header-%s' % name.lower()
-        self.red.setMessage(ident, msg, field_name=name, **vars)
+        self.red.setMessage(ident, msg, field_name=name, **kw)
 
     @staticmethod
     def _parseDate(values):
@@ -254,7 +254,9 @@ def _splitString(instr, item, split):
         """
         if not instr:
             return []
-        return [h.strip() for h in re.findall(r'%s(?=%s|\s*$)' % (item, split), instr)]
+        return [h.strip() for h in re.findall(
+            r'%s(?=%s|\s*$)' % (item, split), instr
+        )]
 
     @GenericHeaderSyntax
     def accept_ranges(self, name, values):
@@ -341,8 +343,10 @@ def content_range(self, name, values):
         return values
 
     @GenericHeaderSyntax
-    @CheckFieldSyntax(r'(?:%(TOKEN)s/%(TOKEN)s(?:\s*;\s*%(PARAMETER)s)*)' % globals(),
-                      rfc2616 % "sec-14.17")
+    @CheckFieldSyntax(
+        r'(?:%(TOKEN)s/%(TOKEN)s(?:\s*;\s*%(PARAMETER)s)*)' % globals(),
+        rfc2616 % "sec-14.17"
+    )
     @SingleFieldValue
     def content_type(self, name, values):
         try:
@@ -421,12 +425,14 @@ def link(self, name, values):
         # TODO: check syntax, values?
         pass
 
-    # The most common problem with Location is a non-absolute URI, so we separate
-    # that from the syntax check.
+    # The most common problem with Location is a non-absolute URI, 
+    # so we separate that from the syntax check.
     @CheckFieldSyntax(URI_reference, rfc2616 % "sec-14.30")
     @SingleFieldValue
     def location(self, name, values):
-        if self.red.res_status not in ["201", "300", "301", "302", "303", "305", "307"]:
+        if self.red.res_status not in [
+            "201", "300", "301", "302", "303", "305", "307"
+        ]:
             self.setMessage(name, rs.LOCATION_UNDEFINED)
         if not re.match(r"^\s*%s\s*$" % URI, values[-1], re.VERBOSE):
             self.setMessage(name, rs.LOCATION_NOT_ABSOLUTE,
@@ -498,8 +504,10 @@ def vary(self, name, values):
         return values
 
     @GenericHeaderSyntax
-    @CheckFieldSyntax(r'(?:%s/)?%s\s+[^,\s]+(?:\s+%s)?' % (TOKEN, TOKEN, COMMENT),
-                      rfc2616 % "sec-14.45")
+    @CheckFieldSyntax(
+        r'(?:%s/)?%s\s+[^,\s]+(?:\s+%s)?' % (TOKEN, TOKEN, COMMENT),
+        rfc2616 % "sec-14.45"
+    )
     def via(self, name, values):
         via_list = u"<ul>" + u"\n".join(
                [u"<li><code>%s</code></li>" % e(v) for v in values]
@@ -548,7 +556,10 @@ def x_meta_mssmarttagspreventparsing(self, name, values):
         return values
 
     @GenericHeaderSyntax
-    @CheckFieldSyntax(PARAMETER, "http://msdn.microsoft.com/en-us/library/cc288325(VS.85).aspx")
+    @CheckFieldSyntax(
+        PARAMETER,
+        "http://msdn.microsoft.com/en-us/library/cc288325(VS.85).aspx"
+    )
     def x_ua_compatible(self, name, values):
         directives = {}
         for directive in values:
@@ -568,7 +579,9 @@ def x_ua_compatible(self, name, values):
 
     @GenericHeaderSyntax
     @SingleFieldValue
-    @CheckFieldSyntax(r'(?:[10](?:\s*;\s*%(PARAMETER)s)*)' % globals(), 'http://blogs.msdn.com/b/ieinternals/archive/2011/01/31/controlling-the-internet-explorer-xss-filter-with-the-x-xss-protection-http-header.aspx')
+    @CheckFieldSyntax(
+        r'(?:[10](?:\s*;\s*%(PARAMETER)s)*)' % globals(), 'http://blogs.msdn.com/b/ieinternals/archive/2011/01/31/controlling-the-internet-explorer-xss-filter-with-the-x-xss-protection-http-header.aspx'
+    )
     def x_xss_protection(self, name, values):
         if int(values[-1].split(';', 1)[0]) == 0:
             self.setMessage(name, rs.XSS_PROTECTION)
@@ -598,15 +611,15 @@ def __init__(self, red):
         except AttributeError:
             self.setMessage('status', rs.STATUS_NONSTANDARD)
 
-    def setMessage(self, name, msg, **vars):
+    def setMessage(self, name, msg, **kw):
         if name:
             ident = 'status %s' % name
         else:
             ident = 'status'
         self.red.setMessage(ident, msg,
                              status=self.red.res_status,
                              enc_status=e(self.red.res_status),
-                             **vars
+                             **kw
                              )
 
     def status100(self):        # Continue
@@ -621,7 +634,10 @@ def status200(self):        # OK
         pass
     def status201(self):        # Created
         if self.red.method in nbhttp.safe_methods:
-            self.setMessage('status', rs.CREATED_SAFE_METHOD, method=self.red.method)
+            self.setMessage('status', 
+                rs.CREATED_SAFE_METHOD, 
+                method=self.red.method
+            )
         if not self.red.parsed_hdrs.has_key('location'):
             self.setMessage('header-location', rs.CREATED_WITHOUT_LOCATION)
     def status202(self):        # Accepted
