From 306dbcff9c708f89572148f0b1d661d2193da68c Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Mon, 17 Dec 2012 13:19:53 -0500 Subject: [PATCH] Rationalize StudentModule unicode and repr strings --- lms/djangoapps/courseware/models.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lms/djangoapps/courseware/models.py b/lms/djangoapps/courseware/models.py index 2b7b12ac45..9c318427ec 100644 --- a/lms/djangoapps/courseware/models.py +++ b/lms/djangoapps/courseware/models.py @@ -60,13 +60,17 @@ class StudentModule(models.Model): created = models.DateTimeField(auto_now_add=True, db_index=True) modified = models.DateTimeField(auto_now=True, db_index=True) - def __unicode__(self): - return '/'.join([self.course_id, self.module_type, - self.student.username, self.module_state_key, str(self.state)[:20]]) - def __repr__(self): - return 'StudentModule%r' % ((self.course_id, self.module_type, self.student, self.module_state_key, str(self.state)[:20]),) + return 'StudentModule<%r>' % ({ + 'course_id': self.course_id, + 'module_type': self.module_type, + 'student': self.student.username, + 'module_state_key': self.module_state_key, + 'state': str(self.state)[:20], + },) + def __unicode__(self): + return unicode(repr(self)) # TODO (cpennington): Remove these once the LMS switches to using XModuleDescriptors