Renaming render() to render_assessment() to avoid collision

apps/openassessment/xblock/openassessmentblock.py

@@ -274,7 +274,7 @@ class OpenAssessmentBlock(XBlock, SubmissionMixin, PeerAssessmentMixin, SelfAsse
         }
         return grade_state
 
-    def render(self, path, context_dict=None):
+    def render_assessment(self, path, context_dict=None):
         """Render an Assessment Module's HTML
 
         Given the name of an assessment module, find it in the list of

apps/openassessment/xblock/peer_assessment_mixin.py

@@ -37,7 +37,7 @@ class PeerAssessmentMixin(object):
                 self.get_student_item_dict(),
                 assessment
             )}
-        return self.render('static/html/oa_peer_assessment.html', context_dict)
+        return self.render_assessment('static/html/oa_peer_assessment.html', context_dict)
 
     def get_peer_submission(self, student_item_dict, assessment):
         peer_submission = False

apps/openassessment/xblock/self_assessment_mixin.py

@@ -5,5 +5,5 @@ class SelfAssessmentMixin(object):
 
     @XBlock.handler
     def render_self_assessment(self, data, suffix=''):
-        return self.render('static/html/oa_self_assessment.html')
+        return self.render_assessment('static/html/oa_self_assessment.html')
 

apps/openassessment/xblock/submission_mixin.py

 from xblock.core import XBlock
-from openassessment.xblock.assessment_mixin import AssessmentMixin
 from submissions import api
 
 
-class SubmissionMixin(AssessmentMixin):
+class SubmissionMixin(object):
 
     submit_errors = {
         # Reported to user sometimes, and useful in tests
@@ -40,4 +39,4 @@ class SubmissionMixin(AssessmentMixin):
 
     @XBlock.handler
     def render_submission(self, data, suffix=''):
-        return self.render('static/html/oa_response.html')
+        return self.render_assessment('static/html/oa_response.html')