clean validate, pep8, remove CRs

plugins/mem.py

@@ -26,5 +26,3 @@ def mem(inp):
         return 'memory usage: %d kB' % total
 
     return mem.__doc__
-
-print mem('')

plugins/util/urlnorm.py

@@ -59,7 +59,7 @@ def normalize(url):
     fragment=quote(clean(fragment), "~")
 
     # note care must be taken to only encode & and = characters as values
-    query="&".join(["=".join([quote(clean(t) , "~:/?#[]@!$'()*+,;=")
+    query="&".join(["=".join([quote(clean(t), "~:/?#[]@!$'()*+,;=")
         for t in q.split("=", 1)]) for q in query.split("&")])
 
     # Prevent dot-segments appearing in non-relative URI paths.

plugins/validate.py

@@ -1,15 +1,14 @@
 '''
-Runs a given url through the w3c validator and queries
-	the result header for information
+Runs a given url through the w3c validator
 
 by Vladi
 '''
 
 import urllib
+import urllib2
 
 from util import hook
 
-path = 'http://validator.w3.org/check?uri=%s'
 
 @hook.command('val')
 @hook.command
@@ -22,14 +21,15 @@ def validate(inp):
     if not inp.startswith('http://'):
         inp = 'http://' + inp
 
-	url = path % (urllib.quote(inp))
-	temp = urllib.urlopen(url).info()
+        url = 'http://validator.w3.org/check?uri=%s' % urllib.quote(inp, '')
+        info = dict(urllib2.urlopen(url).info())
 
-	status = temp.getheader('X-W3C-Validator-Status')
-	if (status == "Valid" or status == "Invalid"):
-		errorcount = temp.getheader('X-W3C-Validator-Errors')
-		warningcount = temp.getheader('X-W3C-Validator-Warnings')
-		return "%s was validated as %s with %s errors and %s warnings. See: %s" \
-			% (inp, status.lower(), errorcount, warningcount, url)
+        print info
+        status = info['x-w3c-validator-status'].lower()
+        if status in ("valid", "invalid"):
+            errorcount = info['x-w3c-validator-errors']
+            warningcount = info['x-w3c-validator-warnings']
+            return "%s was found to be %s with %s errors and %s warnings." \
+                    " see: %s" % (inp, status, errorcount, warningcount, url)
     else:
-		return "Something went wrong while validating %s" % (inp)
+        return "Something went wrong while validating %s" % inp