Merge branch 'fix-tasks'

Fixes pexpect usage in most tasks. Several other cleanups and minor
refactoring.

1 files changed, 3 insertions, 3 deletions

diff --git a/kpov_judge/doc/DEVELOPMENT-FAQ.txt b/kpov_judge/doc/DEVELOPMENT-FAQ.txt
index c5c0286..0c358cc 100644
--- a/kpov_judge/doc/DEVELOPMENT-FAQ.txt
+++ b/kpov_judge/doc/DEVELOPMENT-FAQ.txt
@@ -69,7 +69,7 @@ params_meta = {
         'w': False, # the student is not allowed to change the value of SOME_IP
         'public': True, # the student should be shown the value of SOME_IP if they run test_task.py
         'type':'IP', # this can be used to pick the right function to generate the random value
-                     # Look at kpov_random_helpers.default_generators and kpov_random_helpers.IPv4_addr_gen 
+                     # Look at kpov_util.default_generators and kpov_util.IPv4_addr_gen 
                      # for more info.
         'generated': True # this parameter should be generated by gen_params
     },
@@ -77,7 +77,7 @@ params_meta = {
         'descriptions': {'en': 'The MAC of the server', 'si': u'MAC naslov strežnika'},
         'w': True, # the student can change this value
         'public': True, # the student should see this parameter when they run test_task.py
-        'type':'MAC', # if 'MAC' were a key in kpov_random_helpers.default_generators, the value
+        'type':'MAC', # if 'MAC' were a key in kpov_util.default_generators, the value
                       # in that dictionary should be a random function for generating MAC addresses.
                       # Also, in the future, the 'type' field could be used for validation.
         'generated': False # the student should enter this value his or herself.
@@ -86,7 +86,7 @@ params_meta = {
         'descriptions': {'en': 'The name of the file to find'}, # this won't be shown anywhere
         'w': False, # the student is not allowed to change this
         'public': False, # the student will not be shown this parameter when they run test_task.py
-        'type': 'filename', # this can be used by gen_params or kpov_random_helpers for generation
+        'type': 'filename', # this can be used by gen_params or kpov_util for generation
         'generated': True # the value should be generated in gen_params
     },
 }