fixed indent in radius_mysql_pam/task.py

git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@214 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414

1 files changed, 14 insertions, 11 deletions

diff --git a/kpov_judge/test_task.py b/kpov_judge/test_task.py
index 4658304..79521d4 100755
--- a/kpov_judge/test_task.py
+++ b/kpov_judge/test_task.py
@@ -5,7 +5,10 @@ import yaml
 import json
 import urllib
 import urllib2
-from dialog import Dialog
+try:
+    from dialog import Dialog
+except:
+    Dialog = None
 import os
 import inspect
 import sys
@@ -61,7 +64,7 @@ def add_meta_to_argparser(argparser, meta, defaults = {}):
             desc = v['descriptions'][language].encode("utf-8")
         except:
             desc = k
-        print desc, type(desc)
+        print("{} {}".format(desc, type(desc)))
         argparser.add_argument('--'+k, nargs=1, help=desc, type=unicode, default=defaults.get(k, None))
     return argparser
 
@@ -141,7 +144,7 @@ if __name__ == '__main__':
         help='the language used', default=params.get('language', DEFAULT_LANGUAGE))
     basic_args = basic_argparser.parse_args()
     params['language'] = basic_args.language
-    if not basic_args.quiet:
+    if not basic_args.quiet and Dialog is not None:
         dialog = Dialog(dialog="dialog")
     else:
         dialog = None
@@ -157,8 +160,8 @@ if __name__ == '__main__':
         req = urllib2.Request("{task_url}/{task_name}/task.py".format(**params))
         source = urllib2.urlopen(req)
         task, task_check, task_params_meta, gen_params = load_task(source)
-    except Exception, e:
-        print e
+    except Exception as e:
+        print(e)
         if basic_args.help:
             argparser.print_help()
         else:
@@ -172,9 +175,9 @@ if __name__ == '__main__':
     task_params = params['task_params'][params['task_name']]
     if basic_args.generate_params:
 	#prejema lahko samo stringe in ne številk (potrebno je str(int)
-        print "params before", params, task_params
+        print ("params before: {} {}".format(params, task_params))
         task_params.update(gen_params(params['username'], task_params_meta))
-        print "params after", params, task_params
+        print ("params after: {} {}".format(params, task_params))
     if task_url.startswith('http'):
         req = urllib2.Request("{task_url}/{task_name}/params.json".format(**params))
         web_task_params = json.load(urllib2.urlopen(req))
@@ -186,11 +189,11 @@ if __name__ == '__main__':
         if k in args and args[k] is not None:
             task_params[k] = args[k]
     if dialog is not None:
-        print task_params
+        print(task_params)
         task_params = get_params_dialog(task_params, task_params_meta, dialog=dialog, language = params['language'])
     if basic_args.help:
         # params_argparser.print_help()
-        print params_argparser.format_help()
+        print(params_argparser.format_help())
         exit(0)
     # run task.task()
     public_params = dict()
@@ -200,12 +203,12 @@ if __name__ == '__main__':
     try:
         task_result = task(**public_params)
     # run task.task_check()
-    except Exception, e:
+    except Exception as e:
         print("Error running task(...):")
         print(e)
     try:
         result = task_check(task_result, task_params)
-    except Exception, e:
+    except Exception as e:
         print("Error running task_check(results, params):")
         print(e)
     # print results