From 481cbfd8a56ac5116a7e39d5e79ad7623e2601bd Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Thu, 12 Sep 2013 15:57:13 -0400
Subject: [PATCH] consolidate delete role logic

---
 .../djangoapps/django_comment_common/utils.py | 40 ++++++-------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/common/djangoapps/django_comment_common/utils.py b/common/djangoapps/django_comment_common/utils.py
index a73dc2aadb..388474395c 100644
--- a/common/djangoapps/django_comment_common/utils.py
+++ b/common/djangoapps/django_comment_common/utils.py
@@ -32,37 +32,23 @@ def seed_permissions_roles(course_id):
     administrator_role.inherit_permissions(moderator_role)
 
 
+def _remove_permission_role(course_id, name):
+    try:
+        role = Role.objects.get(name=name, course_id=course_id)
+        if role.course_id == course_id:
+            role.delete()
+    except Role.DoesNotExist:
+        pass
+
+
 def unseed_permissions_roles(course_id):
     """
     A utility method to clean up all forum related permissions and roles
     """
-    try:
-        administrator_role = Role.objects.get(name="Administrator", course_id=course_id)
-        if administrator_role.course_id == course_id:
-            administrator_role.delete()
-    except Role.DoesNotExist:
-        pass
-
-    try:
-        moderator_role = Role.objects.get(name="Moderator", course_id=course_id)
-        if moderator_role.course_id == course_id:
-            moderator_role.delete()
-    except Role.DoesNotExist:
-        pass
-
-    try:
-        community_ta_role = Role.objects.get(name="Community TA", course_id=course_id)
-        if community_ta_role.course_id == course_id:
-            community_ta_role.delete()
-    except Role.DoesNotExist:
-        pass
-
-    try:
-        student_role = Role.objects.get(name="Student", course_id=course_id)
-        if student_role.course_id == course_id:
-            student_role.delete()
-    except Role.DoesNotExist:
-        pass
+    _remove_permission_role(name="Administrator", course_id=course_id)
+    _remove_permission_role(name="Moderator", course_id=course_id)
+    _remove_permission_role(name="Community TA", course_id=course_id)
+    _remove_permission_role(name="Student", course_id=course_id)
 
 
 def are_permissions_roles_seeded(course_id):