diff options
Diffstat (limited to 'kpov_judge/test_prepare_disks.py')
| -rwxr-xr-x | kpov_judge/test_prepare_disks.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kpov_judge/test_prepare_disks.py b/kpov_judge/test_prepare_disks.py index 6121be4..21844a0 100755 --- a/kpov_judge/test_prepare_disks.py +++ b/kpov_judge/test_prepare_disks.py @@ -10,7 +10,7 @@ import glob import subprocess import fcntl import paramiko -import urllib2 +import urllib.request, urllib.error, urllib.parse import yaml from test_task import http_auth from util import write_default_config @@ -144,9 +144,9 @@ class SSHGuestFs: if __name__ == '__main__': if len(sys.argv) != 1: - print "Usage: {0}" - print "Run prepare_disks on running computers over ssh" - print "The task name and params are read from ~/.kpov_params.yaml" + print("Usage: {0}") + print("Run prepare_disks on running computers over ssh") + print("The task name and params are read from ~/.kpov_params.yaml") yaml_config_file = os.path.expanduser("~/.kpov_params.yaml") with open(yaml_config_file) as f: params = yaml.load(f) @@ -156,8 +156,8 @@ if __name__ == '__main__': task_name = params['task_name'] if task_url.startswith('http'): http_auth(task_url, params['username'], params['password']) - req = urllib2.Request("{task_url}/{task_name}/task.py".format(**params)) - source = urllib2.urlopen(req).read() + req = urllib.request.Request("{task_url}/{task_name}/task.py".format(**params)) + source = urllib.request.urlopen(req).read() t = compile(source, 'task.py', 'exec') exec(t) except Exception as e: @@ -166,20 +166,20 @@ if __name__ == '__main__': templates = dict() sshguestfs_params = params.get('sshguestfs_params', dict()) task_sshguestfs_params = sshguestfs_params.get(task_name, dict()) - for computer_name, computer in computers.iteritems(): + for computer_name, computer in computers.items(): comp_params = task_sshguestfs_params.get(computer_name, dict()) for k in ['hostname', 'username', 'password']: try: p = comp_params[k] except: - p = raw_input("{} {}:".format(computer_name, k)) + p = input("{} {}:".format(computer_name, k)) comp_params[k] = p comp_connection = None try: comp_connection = SSHGuestFs(**comp_params) task_sshguestfs_params[computer_name] = comp_params - except Exception, e: - print e + except Exception as e: + print(e) task_sshguestfs_params.pop(computer_name, None) for disk in computer['disks']: disk_name = disk['name'] |