From f2e930a395932dd4e6e4dc5a4404838daaa703ba Mon Sep 17 00:00:00 2001 From: Alexander Kryklia Date: Thu, 27 Dec 2012 13:27:55 +0200 Subject: [PATCH] small improvements --- common/lib/capa/capa/graders/draganddrop.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/lib/capa/capa/graders/draganddrop.py b/common/lib/capa/capa/graders/draganddrop.py index ddd94f13fc..1e847b105b 100644 --- a/common/lib/capa/capa/graders/draganddrop.py +++ b/common/lib/capa/capa/graders/draganddrop.py @@ -46,7 +46,7 @@ def grade(user_input, correct_answer): if use_targets is True: {'1': 't1', 'name_with_icon': 't2'} else: - {'1': '(10, 10)', 'name_with_icon': '[(10, 10), 20]'} + {'1': '[10, 10]', 'name_with_icon': '[[10, 10], 20]'} Returns: True or False. @@ -68,8 +68,7 @@ def grade(user_input, correct_answer): Returns: bool. """ - if not isinstance(correct_answer, list) or \ - not isinstance(user_answer, list): + if not isinstance(correct_answer, list) or isinstance(user_answer, list): return False r = 10