summaryrefslogtreecommitdiff
path: root/kpov_judge/tasks/rename_grep_network
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/rename_grep_network
parent3938c69f3e1586c1ffbcae5395414ca8480e6ba4 (diff)
Run 2to3
Some stuff is broken now.
Diffstat (limited to 'kpov_judge/tasks/rename_grep_network')
-rw-r--r--kpov_judge/tasks/rename_grep_network/task.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/kpov_judge/tasks/rename_grep_network/task.py b/kpov_judge/tasks/rename_grep_network/task.py
index ce3661b..e8ce0b2 100644
--- a/kpov_judge/tasks/rename_grep_network/task.py
+++ b/kpov_judge/tasks/rename_grep_network/task.py
@@ -9,7 +9,7 @@
instructions = {
- 'si': u"""
+ 'si': """
Ustvari dva navidezna računalnika s slikama diskov
- SimpleArbiterExam s sliko diska simpleArbiterDhcp in
SmallStudent s slikama diska student-entrance3
@@ -32,7 +32,7 @@ Pazi, da nobena druga datoteka v domačem imeniku v svojem imenu ne bo vsebovala
Poskrbi, da bo lastnik {testuser}, skupina pa naj ostane nespremenjena.
Brati naj jo ima pravico samo lastnik, pisati lastnik in skupina, poganjati nihče.
""",
- 'en': u'''
+ 'en': '''
''',
}
@@ -252,11 +252,11 @@ def task_check(results, params):
hints += ["wrong file contents\n" + str(diff_pos[1])]
#hints += ["wrong file contents"]
params['dstfile'] = dstfile
- expected_dst_ls = u"ls -l ~/\\*I\\*.txt\r\n-rw--w---- 1 {testuser} bilbo .*{dstfile}\r\n".format(**params)
+ expected_dst_ls = "ls -l ~/\\*I\\*.txt\r\n-rw--w---- 1 {testuser} bilbo .*{dstfile}\r\n".format(**params)
if re.match(expected_dst_ls, results["dst_ls"]):
score += 2
else:
- hints += [u"missing file or wrong user/permissions\n" + results["dst_ls"] + "\n" + expected_dst_ls]
+ hints += ["missing file or wrong user/permissions\n" + results["dst_ls"] + "\n" + expected_dst_ls]
if results["home_ls"].find(params['dstfile']) > -1:
score += 2
expected_mnts = [