Merge pull request #511 from tcmitchell/pep8

Fix PEP 8 warnings and errors

tools/client.py

@@ -102,7 +102,7 @@ def parseOptions(args):
     parser.add_option("--credentials",
                       help="List of comma-separated credential files",
                       default="")
-    parser.add_option("--raw_output", action="store_true", 
+    parser.add_option("--raw_output", action="store_true",
                       dest="raw_output", default=False)
 
     [opts, args] = parser.parse_args(args)
@@ -394,7 +394,7 @@ def main(args=sys.argv, do_print=True):
     # Lookup login info (authorities only)
     elif opts.method in ['lookup_login_info']:
         (result, msg) = \
-            _do_ssl(framework, suppress_errors, reason, fcn, 
+            _do_ssl(framework, suppress_errors, reason, fcn,
                     opts.credentials, client_options)
 
     # Portal query

tools/json_extractor.py

@@ -27,26 +27,29 @@
 #
 # Usage: json_extractor.py keys filename
 # where
-#  keys is a comma-separated list of 
+#  keys is a comma-separated list of
 #      dictionary keys (Lookup the value for key f and continue)
 #      key=value pairs (for finding a dictionary in a list of dictionaries)
 #
 # Thus for JSON containing:
 #
-# {"a": [{"name": "foo", "value": "bar"}, {"name": "boo", "value": "baz"}], "b" : "3"}
+# {"a": [{"name": "foo", "value": "bar"},
+#        {"name": "boo", "value": "baz"}],
+#  "b" : "3"}
 #
 # json_extractor.py a,name=foo,value => bar
 # json_extractor.py b => 3
 
 import json
 import sys
 
+
 def main():
     if len(sys.argv) <= 2:
         print "Usage: json_extractor.py keys filename"
         sys.exit(1)
 
-    keys = sys.argv[1] # Comma separated
+    keys = sys.argv[1]  # Comma separated
     filename = sys.argv[2]
 
     data = open(filename).read()
@@ -74,7 +77,7 @@ def main():
                     (key_name, key_value, result, jdata)
                 sys.exit(1)
             result = found
-            
+
     print result
     return 0