summaryrefslogtreecommitdiff
path: root/kpov_judge/tasks/public_ip_ssh
diff options
context:
space:
mode:
authorTimotej Lazar <timotej.lazar@fri.uni-lj.si>2018-09-26 16:23:29 +0200
committerTimotej Lazar <timotej.lazar@fri.uni-lj.si>2018-09-26 16:23:29 +0200
commit03c9d6d8441e3293b058fed270866419781b734c (patch)
treea456f12f5c26c836685c6e47c95cfe2897e43723 /kpov_judge/tasks/public_ip_ssh
parent3938c69f3e1586c1ffbcae5395414ca8480e6ba4 (diff)
Run 2to3
Some stuff is broken now.
Diffstat (limited to 'kpov_judge/tasks/public_ip_ssh')
-rw-r--r--kpov_judge/tasks/public_ip_ssh/task.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/kpov_judge/tasks/public_ip_ssh/task.py b/kpov_judge/tasks/public_ip_ssh/task.py
index b8f1d87..a566aa5 100644
--- a/kpov_judge/tasks/public_ip_ssh/task.py
+++ b/kpov_judge/tasks/public_ip_ssh/task.py
@@ -6,7 +6,7 @@
OrderedDict = SON
instructions = {
- 'si':u"""
+ 'si':"""
Ustvari dva navidezna računalnika. Za disk enega (imenujmo ga SimpleArbiter) uporabite
sliko diska Test. Na drugega (imenujmo ga A) namesti poljubno Linux distribucijo. Na SimpleArbiter
preberi uporabniško ime in geslo uporabnika, ki ga moraš ustvariti na A. Poskrbi, da se bo novoustvarjeni
@@ -30,9 +30,9 @@ computers = {
networks = { 'net1': {'public': True}, 'net2': {'public': True} }
params_meta = {
- 'peer_ip': {'descriptions': {'si': u'Naslov ssh strežnika'}, 'w': True, 'public':True, 'type': 'IP', 'generated': False},
- 'peer_user': {'descriptions': {'si': u'ime uporabnika'}, 'w': False, 'public': True, 'type': 'username', 'generated': True},
- 'peer_passwd': {'descriptions': {'si': u'geslo uporabnika'}, 'w': False, 'public': True, 'type': 'password', 'generated': True},
+ 'peer_ip': {'descriptions': {'si': 'Naslov ssh strežnika'}, 'w': True, 'public':True, 'type': 'IP', 'generated': False},
+ 'peer_user': {'descriptions': {'si': 'ime uporabnika'}, 'w': False, 'public': True, 'type': 'username', 'generated': True},
+ 'peer_passwd': {'descriptions': {'si': 'geslo uporabnika'}, 'w': False, 'public': True, 'type': 'password', 'generated': True},
}
def task(peer_ip, peer_user, peer_passwd):
@@ -50,7 +50,7 @@ def task_check(results, params):
try:
s.login(peer_ip, peer_user, peer_passwd)
s.logout()
- except Exception, e:
+ except Exception as e:
return 0, [str(e)]
return 10, []