Merge remote-tracking branch 'origin/master'

25 files changed, 1009 insertions, 2 deletions

diff --git a/python/problems/comprehensions/common.py b/python/problems/comprehensions/common.py
new file mode 100644
index 0000000..342ff46
--- /dev/null
+++ b/python/problems/comprehensions/common.py
@@ -0,0 +1,2 @@
+id = 2007
+number = 7
\ No newline at end of file
diff --git a/python/problems/comprehensions/en.py b/python/problems/comprehensions/en.py
new file mode 100644
index 0000000..0f6850f
--- /dev/null
+++ b/python/problems/comprehensions/en.py
@@ -0,0 +1,4 @@
+name = 'List and dictionary comprehensions'
+description = 'Learn how to create (list/dictionary/set) comprehensions. Learn ' \
+              'about iterators and generators.'
+
diff --git a/python/problems/comprehensions/inverse_morse/common.py b/python/problems/comprehensions/inverse_morse/common.py
new file mode 100644
index 0000000..b7644b5
--- /dev/null
+++ b/python/problems/comprehensions/inverse_morse/common.py
@@ -0,0 +1,114 @@
+import re
+from python.util import has_token_sequence, string_almost_equal, \
+    string_contains_number, get_tokens, get_numbers, get_exception_desc, \
+    all_tokens, has_comprehension, has_loop, almost_equal, get_ast
+from server.hints import Hint
+
+id = 20706
+number = 6
+visible = True
+
+solution = '''\
+morse = {
+    'A': '.-',
+    'B': '-...',
+    'C': '-.-.',
+    'D': '-..',
+    'E': '.',
+    'F': '..-.',
+    'G': '--.',
+    'H': '....',
+    'I': '..',
+    'J': '.---',
+    'K': '-.-',
+    'L': '.-..',
+    'M': '--',
+    'N': '-.',
+    'O': '---',
+    'P': '.--.',
+    'Q': '--.-',
+    'R': '.-.',
+    'S': '...',
+    'T': '-',
+    'U': '..-',
+    'V': '...-',
+    'W': '.--',
+    'X': '-..-',
+    'Y': '-.--',
+    'Z': '--..',
+    '1': '.----',
+    '2': '..---',
+    '3': '...--',
+    '4': '....-',
+    '5': '.....',
+    '6': '-....',
+    '7': '--...',
+    '8': '---..',
+    '9': '----.',
+    '0': '-----',
+    ' ': ''
+}
+
+morse_r = {v: k for k, v in morse.items()}
+def morse2txt(s):
+    return ''.join(morse_r[c] for c in s.split(' '))
+'''
+
+hint_type = {
+    'final_hint': Hint('final_hint'),
+    'no_comprehension': Hint('no_comprehension'),
+    'has_loop': Hint('has_loop')
+}
+
+def test(python, code):
+    func_name = 'morse2txt'
+    tokens = get_tokens(code)
+    ast = get_ast(code)
+    if not has_token_sequence(tokens, ['def', func_name]):
+        return False, [{'id' : 'no_func_name', 'args' : {'func_name' : func_name}}]
+
+    in_out = [
+        ('- .  .-', 'TE A'),
+        ('.... . .-.. .-.. ---  .-- --- .-. .-.. -..', 'HELLO WORLD'),
+        ('- .... .  --.- ..- .. -.-. -.-  -... .-. --- .-- -.  ..-. --- -..-  .--- ..- -- .--. . -..  --- ...- . .-.  - .... .  .-.. .- --.. -.--  -.. --- --. ...  -... .- -.-. -.-  .---- ..--- ...-- ....- ..... -.... --... ---.. ----. -----',
+         'THE QUICK BROWN FOX JUMPED OVER THE LAZY DOGS BACK 1234567890'),
+    ]
+
+    test_in = [('{0}("{1}")'.format(func_name, str(l[0])), None)
+               for l in in_out]
+    test_out = [l[1] for l in in_out]
+
+    answers = python(code=code, inputs=test_in, timeout=1.0)
+    n_correct = 0
+    tin, tout = None, None
+    for i, (ans, to) in enumerate(zip(answers, test_out)):
+        corr = ans[0] == to
+        n_correct += corr
+        if not corr:
+            tin = test_in[i][0]
+            tout = to
+
+    passed = n_correct == len(test_in)
+    hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_in)}}]
+    if tin:
+        hints.append({'id': 'problematic_test_case', 'args': {'testin': str(tin), 'testout': str(tout)}})
+    if passed:
+        if not has_comprehension(ast):
+            hints.append({'id': 'no_comprehension'})
+        elif has_loop(ast):
+            hints.append({'id': 'has_loop'})
+        else:
+            hints.append({'id': 'final_hint'})
+
+    return passed, hints
+
+
+def hint(python, code):
+    tokens = get_tokens(code)
+
+    # run one test first to see if there are any exceptions
+    answer = python(code=code, inputs=[(None, None)], timeout=1.0)
+    exc = get_exception_desc(answer[0][3])
+    if exc: return exc
+
+    return None
diff --git a/python/problems/comprehensions/inverse_morse/en.py b/python/problems/comprehensions/inverse_morse/en.py
new file mode 100644
index 0000000..727e885
--- /dev/null
+++ b/python/problems/comprehensions/inverse_morse/en.py
@@ -0,0 +1,13 @@
+id = 20706
+name = 'Inverse morse code'
+
+description = '''\
+<p>(translation missing)</p>'''
+
+hint = {
+    'plan': '''\
+<p>(translation missing)</p>''',
+
+    'no_input_call': '''\
+<p>(translation missing)</p>''',
+}
diff --git a/python/problems/comprehensions/inverse_morse/sl.py b/python/problems/comprehensions/inverse_morse/sl.py
new file mode 100644
index 0000000..ce4bd48
--- /dev/null
+++ b/python/problems/comprehensions/inverse_morse/sl.py
@@ -0,0 +1,38 @@
+import server
+mod = server.problems.load_language('python', 'sl')
+
+
+id = 20706
+name = 'Inverzna Morsejeva abeceda'
+
+description = '''\
+<p>
+Napišite funkcijo <code>morse2txt(code)</code>, ki iz Morsejeve kode razbere
+sporočilo. </p>
+<pre>
+>>> morse2txt('.... . .-.. .-.. ---  .-- --- .-. .-.. -..')
+'HELLO WORLD'
+</pre>
+</p>
+'''
+
+plan = []
+
+hint = {
+    'final_hint': ['''\
+<p>Program je pravilen! <br>
+</p>
+'''],
+
+    'no_comprehension': ['''\
+<p>Program je sicer pravilen, vendar ne vsebuje izpeljanih seznamov ali
+generatorjev...
+</p>
+'''],
+
+    'has_loop': ['''\
+<p>Program je sicer pravilen, vendar vsebuje zanko.
+</p>
+'''],
+
+}
diff --git a/python/problems/comprehensions/isbn/common.py b/python/problems/comprehensions/isbn/common.py
new file mode 100644
index 0000000..4724713
--- /dev/null
+++ b/python/problems/comprehensions/isbn/common.py
@@ -0,0 +1,76 @@
+import re
+from python.util import has_token_sequence, string_almost_equal, \
+    string_contains_number, get_tokens, get_numbers, get_exception_desc, \
+    all_tokens, has_comprehension, has_loop, almost_equal, get_ast
+from server.hints import Hint
+
+id = 20707
+number = 7
+visible = True
+
+solution = '''\
+def valid(isbn):
+    return len(isbn) == 10 and sum((10 if c == 'X' else int(c)) * (10 - i) for i, c in enumerate(isbn)) % 11 == 0
+'''
+
+hint_type = {
+    'final_hint': Hint('final_hint'),
+    'no_comprehension': Hint('no_comprehension'),
+    'has_loop': Hint('has_loop')
+}
+
+def test(python, code):
+    func_name = 'valid'
+    tokens = get_tokens(code)
+    ast = get_ast(code)
+    if not has_token_sequence(tokens, ['def', func_name]):
+        return False, [{'id' : 'no_func_name', 'args' : {'func_name' : func_name}}]
+
+    in_out = [
+        ('0306406152', True),
+        ('0553382578', True),
+        ('0553293370', True),
+        ('912115628X', True),
+        ('03064061522', False),
+        ('1553382578', False),
+        ('91211562811', False),
+    ]
+
+    test_in = [('{0}("{1}")'.format(func_name, str(l[0])), None)
+               for l in in_out]
+    test_out = [l[1] for l in in_out]
+
+    answers = python(code=code, inputs=test_in, timeout=1.0)
+    n_correct = 0
+    tin, tout = None, None
+    for i, (ans, to) in enumerate(zip(answers, test_out)):
+        corr = ans[0] == to
+        n_correct += corr
+        if not corr:
+            tin = test_in[i][0]
+            tout = to
+
+    passed = n_correct == len(test_in)
+    hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_in)}}]
+    if tin:
+        hints.append({'id': 'problematic_test_case', 'args': {'testin': str(tin), 'testout': str(tout)}})
+    if passed:
+        if not has_comprehension(ast):
+            hints.append({'id': 'no_comprehension'})
+        elif has_loop(ast):
+            hints.append({'id': 'has_loop'})
+        else:
+            hints.append({'id': 'final_hint'})
+
+    return passed, hints
+
+
+def hint(python, code):
+    tokens = get_tokens(code)
+
+    # run one test first to see if there are any exceptions
+    answer = python(code=code, inputs=[(None, None)], timeout=1.0)
+    exc = get_exception_desc(answer[0][3])
+    if exc: return exc
+
+    return None
diff --git a/python/problems/comprehensions/isbn/en.py b/python/problems/comprehensions/isbn/en.py
new file mode 100644
index 0000000..638042c
--- /dev/null
+++ b/python/problems/comprehensions/isbn/en.py
@@ -0,0 +1,13 @@
+id = 20707
+name = 'ISBN'
+
+description = '''\
+<p>(translation missing)</p>'''
+
+hint = {
+    'plan': '''\
+<p>(translation missing)</p>''',
+
+    'no_input_call': '''\
+<p>(translation missing)</p>''',
+}
diff --git a/python/problems/comprehensions/isbn/sl.py b/python/problems/comprehensions/isbn/sl.py
new file mode 100644
index 0000000..7805aae
--- /dev/null
+++ b/python/problems/comprehensions/isbn/sl.py
@@ -0,0 +1,39 @@
+import server
+mod = server.problems.load_language('python', 'sl')
+
+
+id = 20707
+name = 'ISBN'
+
+description = '''\
+<p>
+Napišite funkcijo <code>valid(isbn)</code>, ki preveri ali je podan ISBN
+<a href="http://en.wikipedia.org/wiki/Check_digit#ISBN_10">veljaven</a>.</p>
+<pre>
+>>> valid('0306406152'), valid('0553382578'), valid('0553293370'), valid('912115628X') # primer veljavnih ...
+(True, True, True, True)
+>>> valid('03064061522'), valid('1553382578'), valid('91211562811') # ... in neveljavnih ISBN.
+(False, False, False)
+</pre>
+'''
+
+plan = []
+
+hint = {
+    'final_hint': ['''\
+<p>Program je pravilen! <br>
+</p>
+'''],
+
+    'no_comprehension': ['''\
+<p>Program je sicer pravilen, vendar ne vsebuje izpeljanih seznamov ali
+generatorjev...
+</p>
+'''],
+
+    'has_loop': ['''\
+<p>Program je sicer pravilen, vendar vsebuje zanko.
+</p>
+'''],
+
+}
diff --git a/python/problems/comprehensions/morse/common.py b/python/problems/comprehensions/morse/common.py
new file mode 100644
index 0000000..785862e
--- /dev/null
+++ b/python/problems/comprehensions/morse/common.py
@@ -0,0 +1,113 @@
+import re
+from python.util import has_token_sequence, string_almost_equal, \
+    string_contains_number, get_tokens, get_numbers, get_exception_desc, \
+    all_tokens, has_comprehension, has_loop, almost_equal, get_ast
+from server.hints import Hint
+
+id = 20705
+number = 5
+visible = True
+
+solution = '''\
+morse = {
+    'A': '.-',
+    'B': '-...',
+    'C': '-.-.',
+    'D': '-..',
+    'E': '.',
+    'F': '..-.',
+    'G': '--.',
+    'H': '....',
+    'I': '..',
+    'J': '.---',
+    'K': '-.-',
+    'L': '.-..',
+    'M': '--',
+    'N': '-.',
+    'O': '---',
+    'P': '.--.',
+    'Q': '--.-',
+    'R': '.-.',
+    'S': '...',
+    'T': '-',
+    'U': '..-',
+    'V': '...-',
+    'W': '.--',
+    'X': '-..-',
+    'Y': '-.--',
+    'Z': '--..',
+    '1': '.----',
+    '2': '..---',
+    '3': '...--',
+    '4': '....-',
+    '5': '.....',
+    '6': '-....',
+    '7': '--...',
+    '8': '---..',
+    '9': '----.',
+    '0': '-----',
+    ' ': ''
+}
+
+def txt2morse(s):
+    return ' '.join(morse[c] for c in s)
+'''
+
+hint_type = {
+    'final_hint': Hint('final_hint'),
+    'no_comprehension': Hint('no_comprehension'),
+    'has_loop': Hint('has_loop')
+}
+
+def test(python, code):
+    func_name = 'txt2morse'
+    tokens = get_tokens(code)
+    ast = get_ast(code)
+    if not has_token_sequence(tokens, ['def', func_name]):
+        return False, [{'id' : 'no_func_name', 'args' : {'func_name' : func_name}}]
+
+    in_out = [
+        ('TE A', '- .  .-'),
+        ('HELLO WORLD', '.... . .-.. .-.. ---  .-- --- .-. .-.. -..'),
+        ('THE QUICK BROWN FOX JUMPED OVER THE LAZY DOGS BACK 1234567890',
+         '- .... .  --.- ..- .. -.-. -.-  -... .-. --- .-- -.  ..-. --- -..-  .--- ..- -- .--. . -..  --- ...- . .-.  - .... .  .-.. .- --.. -.--  -.. --- --. ...  -... .- -.-. -.-  .---- ..--- ...-- ....- ..... -.... --... ---.. ----. -----'),
+    ]
+
+    test_in = [('{0}("{1}")'.format(func_name, str(l[0])), None)
+               for l in in_out]
+    test_out = [l[1] for l in in_out]
+
+    answers = python(code=code, inputs=test_in, timeout=1.0)
+    n_correct = 0
+    tin, tout = None, None
+    for i, (ans, to) in enumerate(zip(answers, test_out)):
+        corr = ans[0] == to
+        n_correct += corr
+        if not corr:
+            tin = test_in[i][0]
+            tout = to
+
+    passed = n_correct == len(test_in)
+    hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_in)}}]
+    if tin:
+        hints.append({'id': 'problematic_test_case', 'args': {'testin': str(tin), 'testout': str(tout)}})
+    if passed:
+        if not has_comprehension(ast):
+            hints.append({'id': 'no_comprehension'})
+        elif has_loop(ast):
+            hints.append({'id': 'has_loop'})
+        else:
+            hints.append({'id': 'final_hint'})
+
+    return passed, hints
+
+
+def hint(python, code):
+    tokens = get_tokens(code)
+
+    # run one test first to see if there are any exceptions
+    answer = python(code=code, inputs=[(None, None)], timeout=1.0)
+    exc = get_exception_desc(answer[0][3])
+    if exc: return exc
+
+    return None
diff --git a/python/problems/comprehensions/morse/en.py b/python/problems/comprehensions/morse/en.py
new file mode 100644
index 0000000..cc55165
--- /dev/null
+++ b/python/problems/comprehensions/morse/en.py
@@ -0,0 +1,13 @@
+id = 20705
+name = 'Morse code'
+
+description = '''\
+<p>(translation missing)</p>'''
+
+hint = {
+    'plan': '''\
+<p>(translation missing)</p>''',
+
+    'no_input_call': '''\
+<p>(translation missing)</p>''',
+}
diff --git a/python/problems/comprehensions/morse/sl.py b/python/problems/comprehensions/morse/sl.py
new file mode 100644
index 0000000..4c4a7a1
--- /dev/null
+++ b/python/problems/comprehensions/morse/sl.py
@@ -0,0 +1,82 @@
+import server
+mod = server.problems.load_language('python', 'sl')
+
+
+id = 20705
+name = 'Morsejeva abeceda'
+
+description = '''\
+<p>
+Napišite funkcijo <code>txt2morse</code>, ki pretvori sporočilo v
+Morsejevo abecedo. </p>
+<p>
+Morsejeva abeceda izgleda takole: </p>
+<pre>
+'A': '.-',
+'B': '-...',
+'C': '-.-.',
+'D': '-..',
+'E': '.',
+'F': '..-.',
+'G': '--.',
+'H': '....',
+'I': '..',
+'J': '.---',
+'K': '-.-',
+'L': '.-..',
+'M': '--',
+'N': '-.',
+'O': '---',
+'P': '.--.',
+'Q': '--.-',
+'R': '.-.',
+'S': '...',
+'T': '-',
+'U': '..-',
+'V': '...-',
+'W': '.--',
+'X': '-..-',
+'Y': '-.--',
+'Z': '--..',
+'1': '.----',
+'2': '..---',
+'3': '...--',
+'4': '....-',
+'5': '.....',
+'6': '-....',
+'7': '--...',
+'8': '---..',
+'9': '----.',
+'0': '-----',
+</pre>
+
+<p>Primer:
+<pre>
+>>> txt2morse('TE A')
+'- .  .-'
+>>> txt2morse('HELLO WORLD')
+'.... . .-.. .-.. ---  .-- --- .-. .-.. -..'
+</pre>
+</p>
+'''
+
+plan = []
+
+hint = {
+    'final_hint': ['''\
+<p>Program je pravilen! <br>
+</p>
+'''],
+
+    'no_comprehension': ['''\
+<p>Program je sicer pravilen, vendar ne vsebuje izpeljanih seznamov ali
+generatorjev...
+</p>
+'''],
+
+    'has_loop': ['''\
+<p>Program je sicer pravilen, vendar vsebuje zanko.
+</p>
+'''],
+
+}
diff --git a/python/problems/comprehensions/sl.py b/python/problems/comprehensions/sl.py
new file mode 100644
index 0000000..e1ef13c
--- /dev/null
+++ b/python/problems/comprehensions/sl.py
@@ -0,0 +1,3 @@
+name = 'Izpeljani seznami, slovarji, množice; generatorji'
+description = 'Izpeljani seznami, slovarji, množice; generatorji'
+
diff --git a/python/problems/comprehensions/std/common.py b/python/problems/comprehensions/std/common.py
new file mode 100644
index 0000000..05c7357
--- /dev/null
+++ b/python/problems/comprehensions/std/common.py
@@ -0,0 +1,78 @@
+import re
+from python.util import has_token_sequence, string_almost_equal, \
+    string_contains_number, get_tokens, get_numbers, get_exception_desc, \
+    all_tokens, has_comprehension, has_loop, almost_equal, get_ast
+from server.hints import Hint
+
+id = 20704
+number = 4
+visible = True
+
+solution = '''\
+def mean(xs):
+    return sum(xs) / len(xs)
+
+def std(xs):
+    a = mean(xs)
+    return math.sqrt(sum((x - a)**2 for x in xs) / len(xs))
+'''
+
+hint_type = {
+    'final_hint': Hint('final_hint'),
+    'no_comprehension': Hint('no_comprehension'),
+    'has_loop': Hint('has_loop')
+}
+
+def test(python, code):
+    func_name = 'std'
+    tokens = get_tokens(code)
+    ast = get_ast(code)
+    if not has_token_sequence(tokens, ['def', func_name]):
+        return False, [{'id' : 'no_func_name', 'args' : {'func_name' : func_name}}]
+
+    in_out = [
+        ([183, 168, 175, 176, 192, 180], 7.43863786814),
+        ([83, 68, 75, 76, 92, 80], 7.43863786814),
+        ([1, 1, 1], 0),
+        ([1], 0),
+        ([-3, 3], 3)
+    ]
+
+    test_in = [('{0}({1})'.format(func_name, str(l[0])), None)
+               for l in in_out]
+    test_out = [l[1] for l in in_out]
+
+    answers = python(code=code, inputs=test_in, timeout=1.0)
+    n_correct = 0
+    tin, tout = None, None
+    for i, (ans, to) in enumerate(zip(answers, test_out)):
+        corr = isinstance(ans[0], float) and almost_equal(ans[0], to, 3)
+        n_correct += corr
+        if not corr:
+            tin = test_in[i][0]
+            tout = to
+
+    passed = n_correct == len(test_in)
+    hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_in)}}]
+    if tin:
+        hints.append({'id': 'problematic_test_case', 'args': {'testin': str(tin), 'testout': str(tout)}})
+    if passed:
+        if not has_comprehension(ast):
+            hints.append({'id': 'no_comprehension'})
+        elif has_loop(ast):
+            hints.append({'id': 'has_loop'})
+        else:
+            hints.append({'id': 'final_hint'})
+
+    return passed, hints
+
+
+def hint(python, code):
+    tokens = get_tokens(code)
+
+    # run one test first to see if there are any exceptions
+    answer = python(code=code, inputs=[(None, None)], timeout=1.0)
+    exc = get_exception_desc(answer[0][3])
+    if exc: return exc
+
+    return None
diff --git a/python/problems/comprehensions/std/en.py b/python/problems/comprehensions/std/en.py
new file mode 100644
index 0000000..8599da8
--- /dev/null
+++ b/python/problems/comprehensions/std/en.py
@@ -0,0 +1,13 @@
+id = 20704
+name = 'Standard deviation'
+
+description = '''\
+<p>(translation missing)</p>'''
+
+hint = {
+    'plan': '''\
+<p>(translation missing)</p>''',
+
+    'no_input_call': '''\
+<p>(translation missing)</p>''',
+}
diff --git a/python/problems/comprehensions/std/sl.py b/python/problems/comprehensions/std/sl.py
new file mode 100644
index 0000000..ae6e0af
--- /dev/null
+++ b/python/problems/comprehensions/std/sl.py
@@ -0,0 +1,41 @@
+import server
+mod = server.problems.load_language('python', 'sl')
+
+
+id = 20704
+name = 'Standardni odklon'
+
+description = '''\
+<p>
+Napišite funkcijo <code>std(xs)</code>, ki izračuna
+standardni odklon populacije <code>xs</code>. Formulo za standardno deviacijo je
+\[ \sigma = \sqrt{ \\frac{1}{N}\sum_{i=1}^{N} \left(x_i - \mu \\right)^2} \],
+Vrednost \( \mu \) je povprečna vrednost populacije.
+</p>
+<pre>
+>>> xs = [183, 168, 175, 176, 192, 180]
+>>> std(xs)
+7.43863786814
+</pre>
+'''
+
+plan = []
+
+hint = {
+    'final_hint': ['''\
+<p>Program je pravilen! <br>
+</p>
+'''],
+
+    'no_comprehension': ['''\
+<p>Program je sicer pravilen, vendar ne vsebuje izpeljanih seznamov ali
+generatorjev...
+</p>
+'''],
+
+    'has_loop': ['''\
+<p>Program je sicer pravilen, vendar vsebuje zanko.
+</p>
+'''],
+
+}
diff --git a/python/problems/comprehensions/subs/common.py b/python/problems/comprehensions/subs/common.py
new file mode 100644
index 0000000..6998998
--- /dev/null
+++ b/python/problems/comprehensions/subs/common.py
@@ -0,0 +1,72 @@
+import re
+from python.util import has_token_sequence, string_almost_equal, \
+    string_contains_number, get_tokens, get_numbers, get_exception_desc, \
+    all_tokens, has_comprehension, has_loop, get_ast
+from server.hints import Hint
+
+id = 20703
+number = 3
+visible = True
+
+solution = '''\
+def subs(niz, polozaj):
+    return ''.join(niz[int(i)] for i in polozaj)
+'''
+
+hint_type = {
+    'final_hint': Hint('final_hint'),
+    'no_comprehension': Hint('no_comprehension'),
+    'has_loop': Hint('has_loop')
+}
+
+def test(python, code):
+    func_name = 'subs'
+    tokens = get_tokens(code)
+    ast = get_ast(code)
+    if not has_token_sequence(tokens, ['def', func_name]):
+        return False, [{'id' : 'no_func_name', 'args' : {'func_name' : func_name}}]
+
+    in_out = [
+        (("abc", "0002"), 'aaac'),
+        (("komar", "23401"), 'marko'),
+        (("vrana", "02143"), "varan"),
+    ]
+
+    test_in = [('{0}{1}'.format(func_name, str(l[0])), None)
+               for l in in_out]
+    test_out = [l[1] for l in in_out]
+
+    answers = python(code=code, inputs=test_in, timeout=1.0)
+    n_correct = 0
+    tin, tout = None, None
+    for i, (ans, to) in enumerate(zip(answers, test_out)):
+        corr = ans[0] == to
+        n_correct += corr
+        if not corr:
+            tin = test_in[i][0]
+            tout = to
+
+    passed = n_correct == len(test_in)
+    hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_in)}}]
+    if tin:
+        hints.append({'id': 'problematic_test_case', 'args': {'testin': str(tin), 'testout': str(tout)}})
+    if passed:
+        if not has_comprehension(ast):
+            hints.append({'id': 'no_comprehension'})
+        elif has_loop(ast):
+            hints.append({'id': 'has_loop'})
+        else:
+            hints.append({'id': 'final_hint'})
+
+    return passed, hints
+
+
+def hint(python, code):
+    tokens = get_tokens(code)
+
+    # run one test first to see if there are any exceptions
+    answer = python(code=code, inputs=[(None, None)], timeout=1.0)
+    exc = get_exception_desc(answer[0][3])
+    if exc: return exc
+
+    return None
diff --git a/python/problems/comprehensions/subs/en.py b/python/problems/comprehensions/subs/en.py
new file mode 100644
index 0000000..0a9a42b
--- /dev/null
+++ b/python/problems/comprehensions/subs/en.py
@@ -0,0 +1,13 @@
+id = 20703
+name = 'Swap letters'
+
+description = '''\
+<p>(translation missing)</p>'''
+
+hint = {
+    'plan': '''\
+<p>(translation missing)</p>''',
+
+    'no_input_call': '''\
+<p>(translation missing)</p>''',
+}
diff --git a/python/problems/comprehensions/subs/sl.py b/python/problems/comprehensions/subs/sl.py
new file mode 100644
index 0000000..c01fe25
--- /dev/null
+++ b/python/problems/comprehensions/subs/sl.py
@@ -0,0 +1,40 @@
+import server
+mod = server.problems.load_language('python', 'sl')
+
+
+id = 20703
+name = 'Zamenjava črk'
+
+description = '''\
+<p>
+Napišite funkcijo <code>subs(s, pos)</code>, ki premeče črke v nizu
+<code>s</code> glede na podane nove položaje.
+Niz ne bo imel več kot 10 znakov. </p>
+<pre>
+>>> subs("abc", "0002")
+'aaac'
+>>> subs("komar", "23401")
+'marko'
+</pre>
+'''
+
+plan = []
+
+hint = {
+    'final_hint': ['''\
+<p>Program je pravilen! <br>
+</p>
+'''],
+
+    'no_comprehension': ['''\
+<p>Program je sicer pravilen, vendar ne vsebuje izpeljanih seznamov ali
+generatorjev...
+</p>
+'''],
+
+    'has_loop': ['''\
+<p>Program je sicer pravilen, vendar vsebuje zanko.
+</p>
+'''],
+
+}
diff --git a/python/problems/comprehensions/sumsquares/common.py b/python/problems/comprehensions/sumsquares/common.py
new file mode 100644
index 0000000..bda561e
--- /dev/null
+++ b/python/problems/comprehensions/sumsquares/common.py
@@ -0,0 +1,70 @@
+import re
+from python.util import has_token_sequence, string_almost_equal, \
+    string_contains_number, get_tokens, get_numbers, get_exception_desc, all_tokens,\
+    get_ast, has_comprehension, has_loop
+from server.hints import Hint
+
+id = 20701
+number = 1
+visible = True
+
+solution = '''\
+def sumsquares(n):
+    return sum(i**2 for i in range(n+1))
+'''
+
+hint_type = {
+    'final_hint': Hint('final_hint'),
+    'no_comprehension': Hint('no_comprehension')
+}
+
+def test(python, code):
+    func_name = 'sumsquares'
+    tokens = get_tokens(code)
+    ast = get_ast(code)
+    if not has_token_sequence(tokens, ['def', func_name]):
+        return False, [{'id' : 'no_func_name', 'args' : {'func_name' : func_name}}]
+
+    in_out = [
+        (100, 338350),
+        (10, 385),
+    ]
+
+    test_in = [('{0}({1})'.format(func_name, str(l[0])), None)
+               for l in in_out]
+    test_out = [l[1] for l in in_out]
+
+    answers = python(code=code, inputs=test_in, timeout=1.0)
+    n_correct = 0
+    tin, tout = None, None
+    for i, (ans, to) in enumerate(zip(answers, test_out)):
+        corr = ans[0] == to
+        n_correct += corr
+        if not corr:
+            tin = test_in[i][0]
+            tout = to
+
+    passed = n_correct == len(test_in)
+    hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_in)}}]
+    if tin:
+        hints.append({'id': 'problematic_test_case', 'args': {'testin': str(tin), 'testout': str(tout)}})
+    if passed:
+        if not has_comprehension(ast):
+            hints.append({'id': 'no_comprehension'})
+        elif has_loop(ast):
+            hints.append({'id': 'has_loop'})
+        else:
+            hints.append({'id': 'final_hint'})
+
+    return passed, hints
+
+
+def hint(python, code):
+    tokens = get_tokens(code)
+
+    # run one test first to see if there are any exceptions
+    answer = python(code=code, inputs=[(None, None)], timeout=1.0)
+    exc = get_exception_desc(answer[0][3])
+    if exc: return exc
+
+    return None
diff --git a/python/problems/comprehensions/sumsquares/en.py b/python/problems/comprehensions/sumsquares/en.py
new file mode 100644
index 0000000..9f37ffc
--- /dev/null
+++ b/python/problems/comprehensions/sumsquares/en.py
@@ -0,0 +1,13 @@
+id = 20701
+name = 'Sum of squares'
+
+description = '''\
+<p>(translation missing)</p>'''
+
+hint = {
+    'plan': '''\
+<p>(translation missing)</p>''',
+
+    'no_input_call': '''\
+<p>(translation missing)</p>''',
+}
diff --git a/python/problems/comprehensions/sumsquares/sl.py b/python/problems/comprehensions/sumsquares/sl.py
new file mode 100644
index 0000000..b065cb5
--- /dev/null
+++ b/python/problems/comprehensions/sumsquares/sl.py
@@ -0,0 +1,34 @@
+import server
+mod = server.problems.load_language('python', 'sl')
+
+
+id = 20701
+name = 'Vsota kvadratov'
+
+description = '''\
+<p>
+Napišite funkcijo <code>sumsquares(n)</code>, ki izračuna in vrne vsoto: </p>
+<p>1<sup>2</sup> + 2<sup>2</sup> + ... + n<sup>2</sup> = ?</p>
+<p> Nalogo rešite brez zank. </p>
+'''
+
+plan = []
+
+hint = {
+    'final_hint': ['''\
+<p>Program je pravilen! <br>
+</p>
+'''],
+
+    'no_comprehension': ['''\
+<p>Program je sicer pravilen, vendar ne vsebuje izpeljanih seznamov ali
+generatorjev...
+</p>
+'''],
+
+    'has_loop': ['''\
+<p>Program je sicer pravilen, vendar vsebuje zanko.
+</p>
+'''],
+
+}
diff --git a/python/problems/comprehensions/sumsquares_palindrome/common.py b/python/problems/comprehensions/sumsquares_palindrome/common.py
new file mode 100644
index 0000000..9e66eb0
--- /dev/null
+++ b/python/problems/comprehensions/sumsquares_palindrome/common.py
@@ -0,0 +1,74 @@
+import re
+from python.util import has_token_sequence, string_almost_equal, \
+    string_contains_number, get_tokens, get_numbers, get_exception_desc, all_tokens,\
+    get_ast, has_comprehension, has_loop
+
+from server.hints import Hint
+
+id = 20702
+number = 2
+visible = True
+
+solution = '''\
+def ss_palindrome(n):
+    return sum(i**2 for i in range(n) if str(i) == str(i)[::-1])
+'''
+
+hint_type = {
+    'final_hint': Hint('final_hint'),
+    'no_comprehension': Hint('no_comprehension'),
+    'has_loop': Hint('has_loop')
+}
+
+def test(python, code):
+    func_name = 'ss_palindrome'
+    tokens = get_tokens(code)
+    ast = get_ast(code)
+    if not has_token_sequence(tokens, ['def', func_name]):
+        return False, [{'id' : 'no_func_name', 'args' : {'func_name' : func_name}}]
+
+    in_out = [
+        (100, 34770),
+        (10, 285),
+        (1000, 33454620),
+        (1, 0)
+    ]
+
+    test_in = [('{0}({1})'.format(func_name, str(l[0])), None)
+               for l in in_out]
+    test_out = [l[1] for l in in_out]
+
+    answers = python(code=code, inputs=test_in, timeout=1.0)
+    n_correct = 0
+    tin, tout = None, None
+    for i, (ans, to) in enumerate(zip(answers, test_out)):
+        corr = ans[0] == to
+        n_correct += corr
+        if not corr:
+            tin = test_in[i][0]
+            tout = to
+
+    passed = n_correct == len(test_in)
+    hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_in)}}]
+    if tin:
+        hints.append({'id': 'problematic_test_case', 'args': {'testin': str(tin), 'testout': str(tout)}})
+    if passed:
+        if not has_comprehension(ast):
+            hints.append({'id': 'no_comprehension'})
+        elif has_loop(ast):
+            hints.append({'id': 'has_loop'})
+        else:
+            hints.append({'id': 'final_hint'})
+
+    return passed, hints
+
+
+def hint(python, code):
+    tokens = get_tokens(code)
+
+    # run one test first to see if there are any exceptions
+    answer = python(code=code, inputs=[(None, None)], timeout=1.0)
+    exc = get_exception_desc(answer[0][3])
+    if exc: return exc
+
+    return None
diff --git a/python/problems/comprehensions/sumsquares_palindrome/en.py b/python/problems/comprehensions/sumsquares_palindrome/en.py
new file mode 100644
index 0000000..a4416d0
--- /dev/null
+++ b/python/problems/comprehensions/sumsquares_palindrome/en.py
@@ -0,0 +1,13 @@
+id = 20702
+name = 'Sum of squares of palindrome numbers'
+
+description = '''\
+<p>(translation missing)</p>'''
+
+hint = {
+    'plan': '''\
+<p>(translation missing)</p>''',
+
+    'no_input_call': '''\
+<p>(translation missing)</p>''',
+}
diff --git a/python/problems/comprehensions/sumsquares_palindrome/sl.py b/python/problems/comprehensions/sumsquares_palindrome/sl.py
new file mode 100644
index 0000000..bf855f5
--- /dev/null
+++ b/python/problems/comprehensions/sumsquares_palindrome/sl.py
@@ -0,0 +1,36 @@
+import server
+mod = server.problems.load_language('python', 'sl')
+
+
+id = 20702
+name = 'Vsota kvadratov palindromskih števil'
+
+description = '''\
+<p>
+Napišite funkcijo <code>ss_palindrome(n)</code>, ki izračuna in vrne vsoto vseh
+palindromskih števil manjših do števila <code>n</code>. Če je <code>n=1000</code>,
+potem: </p>
+<p>1<sup>2</sup> + 2<sup>2</sup> + ... +
+323<sup>2</sup> + 333<sup>2</sup> + 343<sup>2</sup> + ... + 999<sup>2</sup> = ?</p>
+'''
+
+plan = []
+
+hint = {
+    'final_hint': ['''\
+<p>Program je pravilen! <br>
+</p>
+'''],
+
+    'no_comprehension': ['''\
+<p>Program je sicer pravilen, vendar ne vsebuje izpeljanih seznamov ali
+generatorjev...
+</p>
+'''],
+
+    'has_loop': ['''\
+<p>Program je sicer pravilen, vendar vsebuje zanko.
+</p>
+'''],
+
+}
diff --git a/python/sl.py b/python/sl.py
index 3b2e9d4..6bd3a0d 100644
--- a/python/sl.py
+++ b/python/sl.py
@@ -62,8 +62,8 @@ hint = {
 
     'problematic_test_case': ['''\
 <p>Program ne dela pravilno!<br>
-Poskusi vnesti: [%=testin%] <br>
-pravilen rezultat: [%=testout%]</p>
+Poskusi vnesti: [%=testin%]. <br>
+Pravilen rezultat: [%=testout%].</p>
 '''],
 
     'no_func_name': ['''\