Clean up exception definitions

common/lib/xmodule/xmodule/modulestore/draft_and_published.py

@@ -113,7 +113,7 @@ class ModuleStoreDraftAndPublished(BranchSettingMixin):
         raise NotImplementedError
 
 
-class   UnsupportedRevisionError(ValueError):
+class UnsupportedRevisionError(ValueError):
     """
     This error is raised if a method is called with an unsupported revision parameter.
     """

common/lib/xmodule/xmodule/modulestore/exceptions.py

@@ -74,7 +74,9 @@ class DuplicateCourseError(Exception):
         """
         existing_entry will have the who, when, and other properties of the existing entry
         """
-        super(DuplicateCourseError, self).__init__()
+        super(DuplicateCourseError, self).__init__(
+            u'Cannot create course {}, which duplicates {}'.format(course_id, existing_entry)
+        )
         self.course_id = course_id
         self.existing_entry = existing_entry
 
@@ -84,9 +86,6 @@ class InvalidBranchSetting(Exception):
     Raised when the process' branch setting did not match the required setting for the attempted operation on a store.
     """
     def __init__(self, expected_setting, actual_setting):
-        super(InvalidBranchSetting, self).__init__()
+        super(InvalidBranchSetting, self).__init__(u"Invalid branch: expected {} but got {}".format(expected_setting, actual_setting))
         self.expected_setting = expected_setting
         self.actual_setting = actual_setting
-
-    def __unicode__(self, *args, **kwargs):
-        return u"Invalid branch: expected {} but got {}".format(self.expected_setting, self.actual_setting)