From bdee9a9857a5010ad6b4e21d4a4e622e686144b1 Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Wed, 26 Mar 2014 15:37:56 -0400
Subject: [PATCH] Correctly catch RubricParsingErrors

---
 .../open_ended_grading_classes/grading_service_module.py   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py
index 5d0e1b9545..bc97516b70 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py
@@ -5,7 +5,7 @@ import requests
 from dogapi import dog_stats_api
 from requests.exceptions import RequestException, ConnectionError, HTTPError
 
-from .combined_open_ended_rubric import CombinedOpenEndedRubric
+from .combined_open_ended_rubric import CombinedOpenEndedRubric, RubricParsingError
 from lxml import etree
 
 log = logging.getLogger(__name__)
@@ -153,10 +153,9 @@ class GradingService(object):
                 response_json['rubric'] = rubric_html
             return response_json
         # if we can't parse the rubric into HTML,
-        except etree.XMLSyntaxError, RubricParsingError:
+        except (etree.XMLSyntaxError, RubricParsingError):
             #This is a dev_facing_error
-            log.exception("Cannot parse rubric string. Raw string: {0}"
-            .format(rubric))
+            log.exception("Cannot parse rubric string. Raw string: {0}".format(rubric))
             return {'success': False,
                     'error': 'Error displaying submission'}
         except ValueError: