diff options
Diffstat (limited to 'kpov_judge/tasks/edit_find_grep_compile_convert/task.py')
| -rw-r--r-- | kpov_judge/tasks/edit_find_grep_compile_convert/task.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kpov_judge/tasks/edit_find_grep_compile_convert/task.py b/kpov_judge/tasks/edit_find_grep_compile_convert/task.py index 7a358b9..3d9aafa 100644 --- a/kpov_judge/tasks/edit_find_grep_compile_convert/task.py +++ b/kpov_judge/tasks/edit_find_grep_compile_convert/task.py @@ -9,7 +9,7 @@ instructions = { - 'si':u""" + 'si':""" Ustvari dva navidezna računalnika s slikama diskov - SimpleArbiter s sliko diska simpleArbiterDhcp in SmallStudent s sliko diska student-entrance2. @@ -33,7 +33,7 @@ Program naj prebere znak s standardnega vhoda. Če je B-ti bit nastavljen na 0, naj program izpiše "ti". Program poimenuj {progname} in ga spravi v domači imenik {testuser}. """, - 'en': u''' + 'en': ''' Create two virtual machines - SimpleArbiter using simpleArbiterDhcp as the disk image and SmallStudent using student-entrance2 as its disk. @@ -275,31 +275,31 @@ def task_check(results, params): break hints += ["wrong file contents\n" + str(diff_pos[1])] #hints += ["wrong file contents"] - expected_ls = u"ls -l ~/{dstfile}\r\n-rw--w---- 1 {testuser} bilbo .*{dstfile}.*\r\n".format(**params) + expected_ls = "ls -l ~/{dstfile}\r\n-rw--w---- 1 {testuser} bilbo .*{dstfile}.*\r\n".format(**params) if re.match(expected_ls, results["dst_ls"]): score += 3 else: - hints += [u"missing file or wrong user/permissions\n" + results["dst_ls"]] + hints += ["missing file or wrong user/permissions\n" + results["dst_ls"]] if results["home_ls"].find(params['progname']) > -1: score += 2 else: hints += ["missing program"] - expected_tita = u"" + expected_tita = "" r = random.Random(params['pubseed']) for i in range(N_TITA): b = r.randint(0, 7) x_i = r.randint(37, 127) x = oct(x_i).replace('o', '') - expected_tita += u'echo -e "\\{}" | ~/{} {}\r\n'.format(x, params['progname'], b) + expected_tita += 'echo -e "\\{}" | ~/{} {}\r\n'.format(x, params['progname'], b) if x_i & (1 << b): - expected_tita += u"ta\r\n" + expected_tita += "ta\r\n" else: - expected_tita += u"ti\r\n" + expected_tita += "ti\r\n" if results["tita_return"] == expected_tita: score += 2 else: #hints += [u"program output incorrect\n" + results["tita_return"] + expected_tita] - hints += [u"program output incorrect\n" + results["tita_return"]] + hints += ["program output incorrect\n" + results["tita_return"]] return score, hints |