fixed lint issues

4dn-dcic · Dec 7, 2016 · 64b1879 · 64b1879
1 parent 4b5fef1
commit 64b1879
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 66 deletions.
diff --git a/tests/fetch.py b/tests/fetch.py
@@ -1,45 +1,41 @@
 import wranglertools.fdnDCIC as fdnDCIC
 import os
-import json
 
-def run(keypairs_file, schema_name):
-
-  assert os.path.isfile(str(keypairs_file))
-
-
-  try:
-    key = fdnDCIC.FDN_Key(keypairs_file, "default")
-  except Exception as e:
-    print(e)
-    print("key error")
-    raise e
 
-  try:
-    connection = fdnDCIC.FDN_Connection(key)
-  except Exception as e:
-    print(e)
-    print("connection error")
-    raise e
-
-  try:
-    #response = fdnDCIC.get_FDN("/profiles/file_reference.json", connection, frame="object")
-    response = fdnDCIC.get_FDN("/" + schema_name, connection, frame=None)
-    #response = fdnDCIC.get_FDN("/search/?type=FileReference", connection, frame=None)
-  except Exception as e:
-    print(e)
-    print("post error")
-    raise e
+def run(keypairs_file, schema_name):
 
-  print(response)
+    assert os.path.isfile(str(keypairs_file))
+
+    try:
+        key = fdnDCIC.FDN_Key(keypairs_file, "default")
+    except Exception as e:
+        print(e)
+        print("key error")
+        raise e
+    try:
+        connection = fdnDCIC.FDN_Connection(key)
+    except Exception as e:
+        print(e)
+        print("connection error")
+        raise e
+    try:
+        # response = fdnDCIC.get_FDN("/profiles/file_reference.json", connection, frame="object")
+        response = fdnDCIC.get_FDN("/" + schema_name, connection, frame=None)
+        # response = fdnDCIC.get_FDN("/search/?type=FileReference", connection, frame=None)
+    except Exception as e:
+        print(e)
+        print("post error")
+        raise e
+
+    print(response)
 
 
 if __name__ == "__main__":
-  import argparse
-
-  parser = argparse.ArgumentParser(description="file_reference_upload")
-  parser.add_argument('-k','--keypairs_file',help='key-pairs file')
-  parser.add_argument('-s','--schema',help='schema name (e.g. file_reference, workflow)')
-  args = parser.parse_args()
+    import argparse
 
-  run(args.keypairs_file, args.schema)
+    parser = argparse.ArgumentParser(description="file_reference_upload")
+    parser.add_argument('-k', '--keypairs_file', help='key-pairs file')
+    parser.add_argument('-s', '--schema', help='schema name (e.g. file_reference, workflow)')
+    args = parser.parse_args()
 
+    run(args.keypairs_file, args.schema)
diff --git a/tests/upload.py b/tests/upload.py
@@ -2,44 +2,44 @@
 import os
 import json
 
-def run(keypairs_file,post_json_file, schema_name):
 
-  assert os.path.isfile(keypairs_file)
+def run(keypairs_file, post_json_file, schema_name):
 
-  try:
-    key = fdnDCIC.FDN_Key(keypairs_file, "default")
-  except Exception as e:
-    print(e)
-    print("key error")
-    raise e
+    assert os.path.isfile(keypairs_file)
 
-  try:
-    connection = fdnDCIC.FDN_Connection(key)
-  except Exception as e:
-    print(e)
-    print("connection error")
-    raise e
+    try:
+        key = fdnDCIC.FDN_Key(keypairs_file, "default")
+    except Exception as e:
+        print(e)
+        print("key error")
+        raise e
 
-  try:
-    with open(post_json_file,'r') as f:
-      post_item = json.load(f)
-    response = fdnDCIC.new_FDN(connection, schema_name, post_item)
-  except Exception as e:
-    print(e)
-    print("post error")
-    raise e
+    try:
+        connection = fdnDCIC.FDN_Connection(key)
+    except Exception as e:
+        print(e)
+        print("connection error")
+        raise e
 
-  print(json.dumps(response))
+    try:
+        with open(post_json_file, 'r') as f:
+            post_item = json.load(f)
+            response = fdnDCIC.new_FDN(connection, schema_name, post_item)
+    except Exception as e:
+        print(e)
+        print("post error")
+        raise e
 
+    print(json.dumps(response))
 
-if __name__ == "__main__":
-  import argparse
 
-  parser = argparse.ArgumentParser(description="file_reference_upload")
-  parser.add_argument('-k','--keypairs_file',help='key-pairs file')
-  parser.add_argument('-p','--post_json_file',help='key-pairs file')
-  parser.add_argument('-s','--schema',help='schema name (e.g. file_reference, workflow)')
-  args = parser.parse_args()
+if __name__ == "__main__":
+    import argparse
 
-  run(args.keypairs_file, args.post_json_file, args.schema)
+    parser = argparse.ArgumentParser(description="file_reference_upload")
+    parser.add_argument('-k', '--keypairs_file', help='key-pairs file')
+    parser.add_argument('-p', '--post_json_file', help='key-pairs file')
+    parser.add_argument('-s', '--schema', help='schema name (e.g. file_reference, workflow)')
+    args = parser.parse_args()
 
+    run(args.keypairs_file, args.post_json_file, args.schema)