summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorMartin Možina <martin.mozina@fri.uni-lj.si>2015-12-28 10:23:46 +0100
committerMartin Možina <martin.mozina@fri.uni-lj.si>2015-12-28 10:23:46 +0100
commit165c7165bb2184c9c9e0576a074ba4f29052bf8f (patch)
tree9b86dbbd1d4c39b52bfd7f54cfb13c2354727a53 /python
parent4cdea335b0951e3c12dfb7b906f958d6b5be25c6 (diff)
parentc1bb0d56b2c0482c766d094c65fdf0fd9d1aa0ba (diff)
Merge branch 'master' of 192.168.15.97:codeq-problems
Conflicts: python/problems/functions/palindrome/sl.py python/problems/functions/palindromic_numbers/sl.py
Diffstat (limited to 'python')
-rw-r--r--python/problems/functions/divisors/sl.py6
-rw-r--r--python/problems/functions/divisors_sum/sl.py6
-rw-r--r--python/problems/functions/friendly_numbers/sl.py6
-rw-r--r--python/problems/functions/perfect_numbers/sl.py6
-rw-r--r--python/problems/functions/prime_numbers/sl.py6
-rw-r--r--python/problems/functions/sl.py2
-rw-r--r--python/problems/functions_and_modules/all/sl.py6
-rw-r--r--python/problems/functions_and_modules/any/sl.py6
-rw-r--r--python/problems/functions_and_modules/caesar_cipher/sl.py6
-rw-r--r--python/problems/functions_and_modules/dominoes/sl.py6
-rw-r--r--python/problems/functions_and_modules/largest_sublist/sl.py6
-rw-r--r--python/problems/functions_and_modules/lists_sum/sl.py6
-rw-r--r--python/problems/functions_and_modules/map/sl.py6
-rw-r--r--python/problems/functions_and_modules/multiplicative_range/sl.py6
-rw-r--r--python/problems/functions_and_modules/sl.py2
-rw-r--r--python/problems/functions_and_modules/suspicious_words/sl.py6
-rw-r--r--python/problems/introduction/sl.py2
-rw-r--r--python/problems/lists_and_for/sl.py2
-rw-r--r--python/problems/while_and_if/sl.py2
19 files changed, 19 insertions, 75 deletions
diff --git a/python/problems/functions/divisors/sl.py b/python/problems/functions/divisors/sl.py
index 76b0917..f0e25c4 100644
--- a/python/problems/functions/divisors/sl.py
+++ b/python/problems/functions/divisors/sl.py
@@ -12,11 +12,7 @@ description = '''\
<p>
Napiši funkcijo <code>divisors(n)</code>, ki izpiše vse delitelje števila (brez samega sebe), ki ga vnese uporabnik.</p>'''
-plan = ['''\
-<p></p>
-''',
- '''\
-<p></p>''']
+plan = []
hint = {
'final_hint': ['''\
diff --git a/python/problems/functions/divisors_sum/sl.py b/python/problems/functions/divisors_sum/sl.py
index 47b8719..31cd369 100644
--- a/python/problems/functions/divisors_sum/sl.py
+++ b/python/problems/functions/divisors_sum/sl.py
@@ -13,11 +13,7 @@ description = '''\
Napiši funkcijo <code>divisors_sum(n)</code>, ki vrne vsoto vseh deliteljev števila, ki ga vnese uporabnik.
</p>'''
-plan = ['''\
-<p></p>
-''',
- '''\
-<p></p>''']
+plan = []
hint = {
'final_hint': ['''\
diff --git a/python/problems/functions/friendly_numbers/sl.py b/python/problems/functions/friendly_numbers/sl.py
index 51d47ae..dd15e0d 100644
--- a/python/problems/functions/friendly_numbers/sl.py
+++ b/python/problems/functions/friendly_numbers/sl.py
@@ -23,11 +23,7 @@ None
</p>
<p> Uporabite funkcijo za vsoto deliteljev!</p>'''
-plan = ['''\
-<p></p>
-''',
- '''\
-<p></p>''']
+plan = []
hint = {
'final_hint': ['''\
diff --git a/python/problems/functions/perfect_numbers/sl.py b/python/problems/functions/perfect_numbers/sl.py
index a354a17..156b41d 100644
--- a/python/problems/functions/perfect_numbers/sl.py
+++ b/python/problems/functions/perfect_numbers/sl.py
@@ -16,11 +16,7 @@ Primer popolnega števila je 28, saj so njegovi delitelji 1, 2, 4, 7, 14, njihov
</p>
<p> Uporabite funkcijo za vsoto deliteljev!</p>'''
-plan = ['''\
-<p></p>
-''',
- '''\
-<p></p>''']
+plan = []
hint = {
'final_hint': ['''\
diff --git a/python/problems/functions/prime_numbers/sl.py b/python/problems/functions/prime_numbers/sl.py
index f6c6b24..a224696 100644
--- a/python/problems/functions/prime_numbers/sl.py
+++ b/python/problems/functions/prime_numbers/sl.py
@@ -13,11 +13,7 @@ description = '''\
Napišite funkcijo <code>prime(n)</code>, ki izpiše vsa praštevila manjša od <code>n</code>.
</p>'''
-plan = ['''\
-<p></p>
-''',
- '''\
-<p></p>''']
+plan = []
hint = {
'final_hint': ['''\
diff --git a/python/problems/functions/sl.py b/python/problems/functions/sl.py
index e5f812d..7de0a40 100644
--- a/python/problems/functions/sl.py
+++ b/python/problems/functions/sl.py
@@ -1,3 +1,3 @@
name = 'Funkcije'
-description = 'Pisanje in uporaba funkcij'
+description = 'Pisanje in uporaba funkcij.'
diff --git a/python/problems/functions_and_modules/all/sl.py b/python/problems/functions_and_modules/all/sl.py
index f71fa4b..e224811 100644
--- a/python/problems/functions_and_modules/all/sl.py
+++ b/python/problems/functions_and_modules/all/sl.py
@@ -26,11 +26,7 @@ True
</pre>
</p>'''
-plan = ['''\
-<p></p>
-''',
- '''\
-<p></p>''']
+plan = []
hint = {
'final_hint': ['''\
diff --git a/python/problems/functions_and_modules/any/sl.py b/python/problems/functions_and_modules/any/sl.py
index f32e50e..ab1aacf 100644
--- a/python/problems/functions_and_modules/any/sl.py
+++ b/python/problems/functions_and_modules/any/sl.py
@@ -20,11 +20,7 @@ False
</pre>
</p>'''
-plan = ['''\
-<p></p>
-''',
- '''\
-<p></p>''']
+plan = []
hint = {
'final_hint': ['''\
diff --git a/python/problems/functions_and_modules/caesar_cipher/sl.py b/python/problems/functions_and_modules/caesar_cipher/sl.py
index ea4d9c8..bedf403 100644
--- a/python/problems/functions_and_modules/caesar_cipher/sl.py
+++ b/python/problems/functions_and_modules/caesar_cipher/sl.py
@@ -21,11 +21,7 @@ Predpostavite lahko, da niz <code>s</code> vsebuje le male črke angleške besed
</pre>
</p>'''
-plan = ['''\
-<p></p>
-''',
- '''\
-<p></p>''']
+plan = []
hint = {
'final_hint': ['''\
diff --git a/python/problems/functions_and_modules/dominoes/sl.py b/python/problems/functions_and_modules/dominoes/sl.py
index 41cb860..cfcee24 100644
--- a/python/problems/functions_and_modules/dominoes/sl.py
+++ b/python/problems/functions_and_modules/dominoes/sl.py
@@ -15,11 +15,7 @@ Vrsta domin je podana s seznamom parov (terk), na primer
ki prejme takšen seznam in pove, ali so domine pravilno zložene. Za prvi seznam mora vrniti <code>True</code> in za drugega <code>False</code>.
</p>'''
-plan = ['''\
-<p></p>
-''',
- '''\
-<p></p>''']
+plan = []
hint = {
'final_hint': ['''\
diff --git a/python/problems/functions_and_modules/largest_sublist/sl.py b/python/problems/functions_and_modules/largest_sublist/sl.py
index b550ce2..c3582f0 100644
--- a/python/problems/functions_and_modules/largest_sublist/sl.py
+++ b/python/problems/functions_and_modules/largest_sublist/sl.py
@@ -19,11 +19,7 @@ Napiši funkcijo <code>largest_sublist</code>, ki vrne podseznam z največjo vso
</pre>
</p>'''
-plan = ['''\
-<p></p>
-''',
- '''\
-<p></p>''']
+plan = []
hint = {
'final_hint': ['''\
diff --git a/python/problems/functions_and_modules/lists_sum/sl.py b/python/problems/functions_and_modules/lists_sum/sl.py
index 4baa002..88ac541 100644
--- a/python/problems/functions_and_modules/lists_sum/sl.py
+++ b/python/problems/functions_and_modules/lists_sum/sl.py
@@ -21,11 +21,7 @@ Za gornji seznam naj funkcija vrne seznam <code>[7, 4, 0, 10, 4]</code>, saj je,
</pre>
</p>'''
-plan = ['''\
-<p></p>
-''',
- '''\
-<p></p>''']
+plan = []
hint = {
'final_hint': ['''\
diff --git a/python/problems/functions_and_modules/map/sl.py b/python/problems/functions_and_modules/map/sl.py
index 18c47fb..6695b30 100644
--- a/python/problems/functions_and_modules/map/sl.py
+++ b/python/problems/functions_and_modules/map/sl.py
@@ -20,11 +20,7 @@ in vrne nov seznam <code>[f(x_1), f(x_2), ..., f(x_n)]</code>.
</pre>
</p>'''
-plan = ['''\
-<p></p>
-''',
- '''\
-<p></p>''']
+plan = []
hint = {
'final_hint': ['''\
diff --git a/python/problems/functions_and_modules/multiplicative_range/sl.py b/python/problems/functions_and_modules/multiplicative_range/sl.py
index 8bd4bd0..bb02a84 100644
--- a/python/problems/functions_and_modules/multiplicative_range/sl.py
+++ b/python/problems/functions_and_modules/multiplicative_range/sl.py
@@ -18,11 +18,7 @@ Napišite funkcijo <code>mrange(start, factor, length)</code>, ki vrne seznam, k
</pre>
</p>'''
-plan = ['''\
-<p></p>
-''',
- '''\
-<p></p>''']
+plan = []
hint = {
'final_hint': ['''\
diff --git a/python/problems/functions_and_modules/sl.py b/python/problems/functions_and_modules/sl.py
index fb4f520..e4321ec 100644
--- a/python/problems/functions_and_modules/sl.py
+++ b/python/problems/functions_and_modules/sl.py
@@ -1,3 +1,3 @@
name = 'Funkcije in delo z moduli'
-description = 'Uporaba funkcij in delo z moduli (predvsem z nizi)'
+description = 'Uporaba funkcij in delo z moduli (predvsem z nizi).'
diff --git a/python/problems/functions_and_modules/suspicious_words/sl.py b/python/problems/functions_and_modules/suspicious_words/sl.py
index 3bf2c7b..1aa3bdf 100644
--- a/python/problems/functions_and_modules/suspicious_words/sl.py
+++ b/python/problems/functions_and_modules/suspicious_words/sl.py
@@ -18,11 +18,7 @@ Beseda je sumljiva, če vsebuje tako črko u kot črko a.
</pre>
</p>'''
-plan = ['''\
-<p></p>
-''',
- '''\
-<p></p>''']
+plan = []
hint = {
'final_hint': ['''\
diff --git a/python/problems/introduction/sl.py b/python/problems/introduction/sl.py
index 3141ece..403c941 100644
--- a/python/problems/introduction/sl.py
+++ b/python/problems/introduction/sl.py
@@ -1,3 +1,3 @@
name = 'Uvod'
-description = 'Izrazi, spremenljivke, funkcije, prvi program'
+description = 'Izrazi, spremenljivke, funkcije, prvi program.'
diff --git a/python/problems/lists_and_for/sl.py b/python/problems/lists_and_for/sl.py
index d9c38e9..361f1f0 100644
--- a/python/problems/lists_and_for/sl.py
+++ b/python/problems/lists_and_for/sl.py
@@ -1,2 +1,2 @@
name = 'Seznami in zanka for'
-description = 'Seznami, terke, zanka for' \ No newline at end of file
+description = 'Seznami, terke, zanka for.'
diff --git a/python/problems/while_and_if/sl.py b/python/problems/while_and_if/sl.py
index 3d037b8..fbb177a 100644
--- a/python/problems/while_and_if/sl.py
+++ b/python/problems/while_and_if/sl.py
@@ -1,2 +1,2 @@
name = 'Pogojni stavki in zanke'
-description = 'Logični izrazi, pogojni stavek if-else, zanka while'
+description = 'Logični izrazi, pogojni stavek if-else, zanka while.'