diff options
Diffstat (limited to 'kpov_judge/add_task.py')
| -rwxr-xr-x | kpov_judge/add_task.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/kpov_judge/add_task.py b/kpov_judge/add_task.py index 6bb3a2c..ce6713b 100755 --- a/kpov_judge/add_task.py +++ b/kpov_judge/add_task.py @@ -12,16 +12,16 @@ import glob import os def task_check(results, params): - data = urllib.urlencode({ + data = urllib.parse.urlencode({ 'results': json.dumps(results), 'params': json.dumps(params) }) - req = urllib2.Request('{task_url}/{task_name}/results.json'.format(task_url=task_url, task_name=task_name), data) - response = urllib2.urlopen(req) + req = urllib.request.Request('{task_url}/{task_name}/results.json'.format(task_url=task_url, task_name=task_name), data) + response = urllib.request.urlopen(req) response_dict = json.loads(response.read()) hints = response_dict.get('hints', []) - hints = [u'status: ' + response_dict.get('status', '')] + hints - return response_dict.get('result', 'No result'), u"\n".join(hints) + hints = ['status: ' + response_dict.get('status', '')] + hints + return response_dict.get('result', 'No result'), "\n".join(hints) uploading_task_check_source = inspect.getsource(task_check) @@ -33,7 +33,7 @@ dummy_gen_params_source = inspect.getsource(gen_params) if __name__ == '__main__': if len(sys.argv) < 2: - print u"Usage: {0} <task_dir> [task_name]".format(sys.argv[0]) + print("Usage: {0} <task_dir> [task_name]".format(sys.argv[0])) exit(1) dirname = sys.argv[1] fname = os.path.join(dirname, 'task.py') @@ -43,12 +43,12 @@ if __name__ == '__main__': normpath = os.path.normpath(dirname) class_id = os.path.split(os.path.dirname(normpath))[-1] task_id = os.path.basename(normpath) - print(class_id, task_id) + print((class_id, task_id)) db = pymongo.MongoClient(settings.DB_HOST).kpov try: db.authenticate(settings.USERNAME, settings.PASSWORD) - except Exception, e: - print "Not authenticated:"+str(e) + except Exception as e: + print("Not authenticated:"+str(e)) #no auth or auth config? source = open(fname).read() code = compile(source, fname, 'exec') @@ -56,7 +56,7 @@ if __name__ == '__main__': # task, task_check, gen_params, prepare_disks, computers, params_meta. exec(code) public_meta = dict() - for k, v in params_meta.iteritems(): + for k, v in params_meta.items(): if v.get('public', False): public_meta[k] = v task_source = "\n\n".join([ @@ -67,10 +67,10 @@ if __name__ == '__main__': task_check_source = inspect.getsource(task_check) gen_params_source = inspect.getsource(gen_params) prepare_disks_source = inspect.getsource(prepare_disks) - x = params_meta.keys() # check for existence + x = list(params_meta.keys()) # check for existence db.computers_meta.remove({'task_id': task_id, 'class_id': class_id}) auto_networks = set([None]) - for k, v in computers.iteritems(): + for k, v in computers.items(): for n in v.get('networks_interfaces', []): auto_networks.add(n.get('network', None)) db.computers_meta.update({ @@ -81,7 +81,7 @@ if __name__ == '__main__': auto_networks.remove(None) db.networks.remove({'task_id': task_id, 'class_id': class_id}) try: - net_list = networks.iteritems() + net_list = iter(networks.items()) except: net_list = [(k, {'public': False}) for k in auto_networks] for k, v in net_list: |