diff --git a/scripts/grt-submit.py b/scripts/grt-submit.py index 8081926ed10..92d4a28a691 100644 --- a/scripts/grt-submit.py +++ b/scripts/grt-submit.py @@ -8,7 +8,6 @@ from __future__ import print_function import argparse import os import sys -import time import yaml import logging import requests @@ -53,7 +52,7 @@ def main(argv): # so now we can know which to send. local_reports = [x.strip('.json') for x in os.listdir(REPORT_DIR) if x.endswith('.json')] for report_id in local_reports: - if not report_id in remote_reports: + if report_id not in remote_reports: print("Uploading %s" % report_id) files = { 'meta': open(os.path.join(sys.argv[1], report_id + '.json'), 'rb'), diff --git a/scripts/grt.py b/scripts/grt.py index af0f81e899d..86235bf3515 100644 --- a/scripts/grt.py +++ b/scripts/grt.py @@ -117,8 +117,8 @@ class Sanitization: if data['src'] == 'hda': try: dataset = self.sa_session.query(self.model.Dataset.id, self.model.Dataset.total_size) \ - .filter_by(id=data['id']) \ - .first() + .filter_by(id=data['id']) \ + .first() if dataset and dataset[1]: data['size'] = int(dataset[1]) else: @@ -132,7 +132,6 @@ class Sanitization: else: raise Exception("Cannot handle {src} yet".format(data)) - def _sanitize_dict(self, unsanitized_dict, path=""): # if it is a file dictionary, handle specially. if len(unsanitized_dict.keys()) == 2 and \ @@ -268,15 +267,15 @@ def main(argv): .all(): # TODO: blacklisted - handle_job.write(str(job[0])) # id + handle_job.write(str(job[0])) # id handle_job.write('\t') - handle_job.write(job[2]) # tool_id + handle_job.write(job[2]) # tool_id handle_job.write('\t') - handle_job.write(job[3]) # tool_version + handle_job.write(job[3]) # tool_version handle_job.write('\t') - handle_job.write(job[4]) # state + handle_job.write(job[4]) # state handle_job.write('\t') - handle_job.write(str(job[5])) # create_time + handle_job.write(str(job[5])) # create_time handle_job.write('\n') # meta counts job_state_data[job[4]] += 1