diff --git a/cms/djangoapps/contentstore/tests/test_core_caching.py b/cms/djangoapps/contentstore/tests/test_core_caching.py index 7470ac1d9d..1d8aeec158 100644 --- a/cms/djangoapps/contentstore/tests/test_core_caching.py +++ b/cms/djangoapps/contentstore/tests/test_core_caching.py @@ -3,7 +3,7 @@ from opaque_keys.edx.locations import Location from django.test import TestCase -class Content: +class Content(object): def __init__(self, location, content): self.location = location self.content = content diff --git a/common/lib/xmodule/xmodule/capa_base_constants.py b/common/lib/xmodule/xmodule/capa_base_constants.py index 20eab88a07..7739be238e 100644 --- a/common/lib/xmodule/xmodule/capa_base_constants.py +++ b/common/lib/xmodule/xmodule/capa_base_constants.py @@ -4,7 +4,7 @@ Constants for capa_base problems """ -class SHOWANSWER: +class SHOWANSWER(object): """ Constants for when to show answer """ @@ -18,7 +18,7 @@ class SHOWANSWER: NEVER = "never" -class RANDOMIZATION: +class RANDOMIZATION(object): """ Constants for problem randomization """ diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py index 2f3d2f7159..3a7794a0c9 100644 --- a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py +++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py @@ -67,7 +67,7 @@ HUMAN_STATES = { SKIP_BASIC_CHECKS = False -class CombinedOpenEndedV1Module(): +class CombinedOpenEndedV1Module(object): """ This is a module that encapsulates all open ended grading (self assessment, peer assessment, etc). It transitions between problems, and support arbitrary ordering. @@ -1185,7 +1185,7 @@ class CombinedOpenEndedV1Module(): return declaration -class CombinedOpenEndedV1Descriptor(): +class CombinedOpenEndedV1Descriptor(object): """ Module for adding combined open ended questions """ diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py index b4801ad16b..c0f050e1fc 100644 --- a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py +++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py @@ -846,7 +846,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild): return score -class OpenEndedDescriptor(): +class OpenEndedDescriptor(object): """ Module for adding open ended response questions to courses """ diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py index e9881db344..fb82c54271 100644 --- a/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py +++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py @@ -286,7 +286,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild): return [rubric_scores] -class SelfAssessmentDescriptor(): +class SelfAssessmentDescriptor(object): """ Module for adding self assessment questions to courses """ diff --git a/common/lib/xmodule/xmodule/tests/test_content.py b/common/lib/xmodule/xmodule/tests/test_content.py index f3eea8bbc8..54adb9cf6f 100644 --- a/common/lib/xmodule/xmodule/tests/test_content.py +++ b/common/lib/xmodule/xmodule/tests/test_content.py @@ -50,13 +50,13 @@ injected humour and the like). """ -class Content: +class Content(object): def __init__(self, location, content_type): self.location = location self.content_type = content_type -class FakeGridFsItem: +class FakeGridFsItem(object): """ This class provides the basic methods to get data from a GridFS item """ diff --git a/lms/djangoapps/bulk_email/forms.py b/lms/djangoapps/bulk_email/forms.py index cacd689d87..e9ef4c9413 100644 --- a/lms/djangoapps/bulk_email/forms.py +++ b/lms/djangoapps/bulk_email/forms.py @@ -22,7 +22,7 @@ class CourseEmailTemplateForm(forms.ModelForm): name = forms.CharField(required=False) - class Meta: # pylint: disable=missing-docstring + class Meta(object): # pylint: disable=missing-docstring model = CourseEmailTemplate fields = ('html_template', 'plain_template', 'name') @@ -76,7 +76,7 @@ class CourseEmailTemplateForm(forms.ModelForm): class CourseAuthorizationAdminForm(forms.ModelForm): """Input form for email enabling, allowing us to verify data.""" - class Meta: # pylint: disable=missing-docstring + class Meta(object): # pylint: disable=missing-docstring model = CourseAuthorization def clean_course_id(self): diff --git a/lms/djangoapps/bulk_email/models.py b/lms/djangoapps/bulk_email/models.py index df59c8fc1d..e9ab0b52c4 100644 --- a/lms/djangoapps/bulk_email/models.py +++ b/lms/djangoapps/bulk_email/models.py @@ -44,7 +44,7 @@ class Email(models.Model): created = models.DateTimeField(auto_now_add=True) modified = models.DateTimeField(auto_now=True) - class Meta: # pylint: disable=missing-docstring + class Meta(object): # pylint: disable=missing-docstring abstract = True @@ -142,7 +142,7 @@ class Optout(models.Model): user = models.ForeignKey(User, db_index=True, null=True) course_id = CourseKeyField(max_length=255, db_index=True) - class Meta: # pylint: disable=missing-docstring + class Meta(object): # pylint: disable=missing-docstring unique_together = ('user', 'course_id') diff --git a/lms/djangoapps/certificates/models.py b/lms/djangoapps/certificates/models.py index d5cdd61eaf..6d0ba63c07 100644 --- a/lms/djangoapps/certificates/models.py +++ b/lms/djangoapps/certificates/models.py @@ -114,7 +114,7 @@ class GeneratedCertificate(models.Model): auto_now=True, default=datetime.now) error_reason = models.CharField(max_length=512, blank=True, default='') - class Meta: + class Meta(object): unique_together = (('user', 'course_id'),) @classmethod diff --git a/lms/djangoapps/course_wiki/editors.py b/lms/djangoapps/course_wiki/editors.py index 3708cec1af..73c54c2ccb 100644 --- a/lms/djangoapps/course_wiki/editors.py +++ b/lms/djangoapps/course_wiki/editors.py @@ -42,7 +42,7 @@ class CodeMirror(BaseEditor): def get_widget(self, instance=None): return CodeMirrorWidget() - class AdminMedia: + class AdminMedia(object): css = { 'all': ("wiki/markitup/skins/simple/style.css", "wiki/markitup/sets/admin/style.css",) @@ -52,7 +52,7 @@ class CodeMirror(BaseEditor): "wiki/markitup/sets/admin/set.js", ) - class Media: + class Media(object): css = { 'all': ("js/vendor/CodeMirror/codemirror.css",) } diff --git a/lms/djangoapps/courseware/models.py b/lms/djangoapps/courseware/models.py index d1f1f45b89..046f3213c8 100644 --- a/lms/djangoapps/courseware/models.py +++ b/lms/djangoapps/courseware/models.py @@ -46,7 +46,7 @@ class StudentModule(models.Model): course_id = CourseKeyField(max_length=255, db_index=True) - class Meta: + class Meta(object): unique_together = (('student', 'module_state_key', 'course_id'),) ## Internal state of the object @@ -102,7 +102,7 @@ class StudentModuleHistory(models.Model): HISTORY_SAVING_TYPES = {'problem'} - class Meta: + class Meta(object): get_latest_by = "created" student_module = models.ForeignKey(StudentModule, db_index=True) @@ -135,7 +135,7 @@ class XBlockFieldBase(models.Model): """ Base class for all XBlock field storage. """ - class Meta: + class Meta(object): abstract = True # The name of the field @@ -163,7 +163,7 @@ class XModuleUserStateSummaryField(XBlockFieldBase): Stores data set in the Scope.user_state_summary scope by an xmodule field """ - class Meta: + class Meta(object): unique_together = (('usage_id', 'field_name'),) # The definition id for the module @@ -175,7 +175,7 @@ class XModuleStudentPrefsField(XBlockFieldBase): Stores data set in the Scope.preferences scope by an xmodule field """ - class Meta: # pylint: disable=missing-docstring + class Meta(object): # pylint: disable=missing-docstring unique_together = (('student', 'module_type', 'field_name'),) # The type of the module for these preferences @@ -189,7 +189,7 @@ class XModuleStudentInfoField(XBlockFieldBase): Stores data set in the Scope.preferences scope by an xmodule field """ - class Meta: + class Meta(object): unique_together = (('student', 'field_name'),) student = models.ForeignKey(User, db_index=True) @@ -219,7 +219,7 @@ class OfflineComputedGradeLog(models.Model): Log of when offline grades are computed. Use this to be able to show instructor when the last computed grades were done. """ - class Meta: + class Meta(object): ordering = ["-created"] get_latest_by = "created" diff --git a/lms/djangoapps/foldit/models.py b/lms/djangoapps/foldit/models.py index 4f0b3d16f6..763f3951c4 100644 --- a/lms/djangoapps/foldit/models.py +++ b/lms/djangoapps/foldit/models.py @@ -83,7 +83,7 @@ class PuzzleComplete(models.Model): e.g. PuzzleID 1234, set 1, subset 3. (Sets and subsets correspond to levels in the intro puzzles) """ - class Meta: + class Meta(object): # there should only be one puzzle complete entry for any particular # puzzle for any user unique_together = ('user', 'puzzle_id', 'puzzle_set', 'puzzle_subset') diff --git a/lms/djangoapps/mobile_api/users/serializers.py b/lms/djangoapps/mobile_api/users/serializers.py index f7ecb2f931..9b12c054bf 100644 --- a/lms/djangoapps/mobile_api/users/serializers.py +++ b/lms/djangoapps/mobile_api/users/serializers.py @@ -80,7 +80,7 @@ class CourseEnrollmentSerializer(serializers.ModelSerializer): else: return {} - class Meta: # pylint: disable=missing-docstring + class Meta(object): # pylint: disable=missing-docstring model = CourseEnrollment fields = ('created', 'mode', 'is_active', 'course', 'certificate') lookup_field = 'username' @@ -96,7 +96,7 @@ class UserSerializer(serializers.HyperlinkedModelSerializer): lookup_field='username' ) - class Meta: # pylint: disable=missing-docstring + class Meta(object): # pylint: disable=missing-docstring model = User fields = ('id', 'username', 'email', 'name', 'course_enrollments') lookup_field = 'username' diff --git a/lms/djangoapps/notifier_api/serializers.py b/lms/djangoapps/notifier_api/serializers.py index a3877f1e5b..1705111b4a 100644 --- a/lms/djangoapps/notifier_api/serializers.py +++ b/lms/djangoapps/notifier_api/serializers.py @@ -63,7 +63,7 @@ class NotifierUserSerializer(serializers.ModelSerializer): pass return ret - class Meta: + class Meta(object): model = User fields = ("id", "email", "name", "preferences", "course_info") read_only_fields = ("id", "email") diff --git a/lms/djangoapps/survey/admin.py b/lms/djangoapps/survey/admin.py index 07431e6d56..9552789b98 100644 --- a/lms/djangoapps/survey/admin.py +++ b/lms/djangoapps/survey/admin.py @@ -10,7 +10,7 @@ from survey.models import SurveyForm class SurveyFormAdminForm(forms.ModelForm): """Form providing validation of SurveyForm content.""" - class Meta: # pylint: disable=missing-docstring + class Meta(object): # pylint: disable=missing-docstring model = SurveyForm fields = ('name', 'form') diff --git a/lms/djangoapps/verify_student/models.py b/lms/djangoapps/verify_student/models.py index 10bd7ad9ae..4398a82975 100644 --- a/lms/djangoapps/verify_student/models.py +++ b/lms/djangoapps/verify_student/models.py @@ -177,7 +177,7 @@ class PhotoVerification(StatusModel): # capturing it so that we can later query for the common problems. error_code = models.CharField(blank=True, max_length=50) - class Meta: + class Meta(object): abstract = True ordering = ['-created_at']