Some PEP8 related style cleaning

lib/request/basic.py

@@ -110,7 +110,7 @@ def checkCharEncoding(encoding, warn=True):
     else:
         return encoding
 
-    # http://www.destructor.de/charsets/index.htm
+    # Reference: http://www.destructor.de/charsets/index.htm
     translate = { "windows-874": "iso-8859-11", "en_us": "utf8", "macintosh": "iso-8859-1", "euc_tw": "big5_tw", "th": "tis-620", "unicode": "utf8",  "utc8": "utf8", "ebcdic": "ebcdic-cp-be"}
 
     for delimiter in (';', ',', '('):
@@ -119,17 +119,17 @@ def checkCharEncoding(encoding, warn=True):
 
     # popular typos/errors
     if "8858" in encoding:
-        encoding = encoding.replace("8858", "8859") # iso-8858 -> iso-8859
+        encoding = encoding.replace("8858", "8859")  # iso-8858 -> iso-8859
     elif "8559" in encoding:
-        encoding = encoding.replace("8559", "8859") # iso-8559 -> iso-8859
+        encoding = encoding.replace("8559", "8859")  # iso-8559 -> iso-8859
     elif "5889" in encoding:
-        encoding = encoding.replace("5889", "8859") # iso-5889 -> iso-8859
+        encoding = encoding.replace("5889", "8859")  # iso-5889 -> iso-8859
     elif "5589" in encoding:
-        encoding = encoding.replace("5589", "8859") # iso-5589 -> iso-8859
+        encoding = encoding.replace("5589", "8859")  # iso-5589 -> iso-8859
     elif "2313" in encoding:
-        encoding = encoding.replace("2313", "2312") # gb2313 -> gb2312
+        encoding = encoding.replace("2313", "2312")  # gb2313 -> gb2312
     elif "x-euc" in encoding:
-        encoding = encoding.replace("x-euc", "euc") # x-euc-kr -> euc-kr
+        encoding = encoding.replace("x-euc", "euc")  # x-euc-kr -> euc-kr
 
     # name adjustment for compatibility
     if encoding.startswith("8859"):
@@ -149,14 +149,14 @@ def checkCharEncoding(encoding, warn=True):
     elif encoding.find("utf8") > 0:
         encoding = "utf8"
 
-    # http://philip.html5.org/data/charsets-2.html
+    # Reference: http://philip.html5.org/data/charsets-2.html
     if encoding in translate:
         encoding = translate[encoding]
     elif encoding in ("null", "{charset}", "*"):
         return None
 
-    # http://www.iana.org/assignments/character-sets
-    # http://docs.python.org/library/codecs.html
+    # Reference: http://www.iana.org/assignments/character-sets
+    # Reference: http://docs.python.org/library/codecs.html
     try:
         codecs.lookup(encoding)
     except LookupError:
@@ -216,7 +216,7 @@ def decodePage(page, contentEncoding, contentType):
     if not conf.charset:
         httpCharset, metaCharset = None, None
 
-        # http://stackoverflow.com/questions/1020892/python-urllib2-read-to-unicode
+        # Reference: http://stackoverflow.com/questions/1020892/python-urllib2-read-to-unicode
         if contentType and (contentType.find("charset=") != -1):
             httpCharset = checkCharEncoding(contentType.split("charset=")[-1])
 

lib/request/certhandler.py

@@ -21,7 +21,7 @@ class HTTPSCertAuthHandler(urllib2.HTTPSHandler):
         return self.do_open(self.getConnection, req)
 
     def getConnection(self, host):
-        if sys.version_info >= (2,6):
+        if sys.version_info >= (2, 6):
             retVal = httplib.HTTPSConnection(host, key_file=self.key_file, cert_file=self.cert_file, timeout=conf.timeout)
         else:
             retVal = httplib.HTTPSConnection(host, key_file=self.key_file, cert_file=self.cert_file)

lib/request/connect.py

@@ -398,7 +398,7 @@ class Connect(object):
                     if url.lower().startswith('http://'):
                         kwargs['url'] = url
                     else:
-                        kwargs['url'] = conf.url[:conf.url.rfind('/')+1] + url
+                        kwargs['url'] = conf.url[:conf.url.rfind('/') + 1] + url
 
                     threadData.lastRedirectMsg = (threadData.lastRequestUID, page)
                     kwargs['refreshing'] = True

lib/request/dns.py

@@ -32,7 +32,7 @@ class DNSQuery(object):
             j = ord(raw[i])
 
             while j != 0:
-                self._query += raw[i+1:i+j+1] + '.'
+                self._query += raw[i + 1:i + j + 1] + '.'
                 i = i + j + 1
                 j = ord(raw[i])
 
@@ -137,4 +137,3 @@ if __name__ == "__main__":
     finally:
         if server:
             server._running = False
-

lib/request/inject.py

@@ -361,7 +361,7 @@ def getValue(expression, blind=True, union=True, error=True, time=True, fromUser
                     found = (value is not None) or (value is None and expectingNone) or count >= MAX_TECHNIQUES_PER_VALUE
 
                 if found and conf.dnsName:
-                    _ = "".join(filter(None, (key if isTechniqueAvailable(value) else None for key, value in {"E":PAYLOAD.TECHNIQUE.ERROR, "Q":PAYLOAD.TECHNIQUE.QUERY, "U":PAYLOAD.TECHNIQUE.UNION}.items())))
+                    _ = "".join(filter(None, (key if isTechniqueAvailable(value) else None for key, value in {"E": PAYLOAD.TECHNIQUE.ERROR, "Q": PAYLOAD.TECHNIQUE.QUERY, "U": PAYLOAD.TECHNIQUE.UNION}.items())))
                     warnMsg = "option '--dns-domain' will be ignored "
                     warnMsg += "as faster techniques are usable "
                     warnMsg += "(%s) " % _

lib/request/proxy.py

@@ -17,7 +17,7 @@ if PYVERSION >= "2.6":
     import ssl
 
 class ProxyHTTPConnection(httplib.HTTPConnection):
-    _ports = {"http" : 80, "https" : 443}
+    _ports = {"http": 80, "https": 443}
 
     def request(self, method, url, body=None, headers={}):
         # Request is called before connect, so can interpret url and get