diff --git a/cms/djangoapps/contentstore/features/common.py b/cms/djangoapps/contentstore/features/common.py index 0ac82a6545..491201bd15 100644 --- a/cms/djangoapps/contentstore/features/common.py +++ b/cms/djangoapps/contentstore/features/common.py @@ -333,7 +333,6 @@ def get_codemirror_value(index=0, find_prefix="$"): ) - def attach_file(filename, sub_path): path = os.path.join(TEST_ROOT, sub_path, filename) world.browser.execute_script("$('input.file-input').css('display', 'block')") diff --git a/cms/djangoapps/contentstore/tests/test_transcripts_utils.py b/cms/djangoapps/contentstore/tests/test_transcripts_utils.py index 858f07a8b3..1a82ba4829 100644 --- a/cms/djangoapps/contentstore/tests/test_transcripts_utils.py +++ b/cms/djangoapps/contentstore/tests/test_transcripts_utils.py @@ -161,7 +161,6 @@ class TestDownloadYoutubeSubs(ModuleStoreTestCase): number = '999' display_name = 'Test course' - def clear_sub_content(self, subs_id): """ Remove, if subtitle content exists. @@ -490,7 +489,6 @@ class TestTranscript(unittest.TestCase): """) - self.sjson_transcript = textwrap.dedent("""\ { "start": [ diff --git a/cms/djangoapps/contentstore/views/user.py b/cms/djangoapps/contentstore/views/user.py index b316de987e..7e3b720e2b 100644 --- a/cms/djangoapps/contentstore/views/user.py +++ b/cms/djangoapps/contentstore/views/user.py @@ -100,7 +100,6 @@ def _course_team_user(request, course_key, email): } return JsonResponse(msg, 400) - try: user = User.objects.get(email=email) except Exception: diff --git a/common/djangoapps/course_modes/tests/test_views.py b/common/djangoapps/course_modes/tests/test_views.py index ed6d817ad3..70ee329610 100644 --- a/common/djangoapps/course_modes/tests/test_views.py +++ b/common/djangoapps/course_modes/tests/test_views.py @@ -150,7 +150,6 @@ class CourseModeViewTest(ModuleStoreTestCase): response = self.client.get(choose_track_url) self.assertRedirects(response, reverse('dashboard')) - # Mapping of course modes to the POST parameters sent # when the user chooses that mode. POST_PARAMS_FOR_COURSE_MODE = { diff --git a/common/djangoapps/dark_lang/tests.py b/common/djangoapps/dark_lang/tests.py index c1174adc8b..0f85fb390f 100644 --- a/common/djangoapps/dark_lang/tests.py +++ b/common/djangoapps/dark_lang/tests.py @@ -144,7 +144,6 @@ class DarkLangMiddlewareTests(TestCase): self.process_request(accept='rel-ter;q=1.0, rel;q=0.5') ) - def assertSessionLangEquals(self, value, request): """ Assert that the 'django_language' set in request.session is equal to value diff --git a/common/djangoapps/edxmako/makoloader.py b/common/djangoapps/edxmako/makoloader.py index 8e741f9946..8c2781cddc 100644 --- a/common/djangoapps/edxmako/makoloader.py +++ b/common/djangoapps/edxmako/makoloader.py @@ -34,7 +34,6 @@ class MakoLoader(object): self.module_directory = module_directory - def __call__(self, template_name, template_dirs=None): return self.load_template(template_name, template_dirs) diff --git a/common/djangoapps/status/tests.py b/common/djangoapps/status/tests.py index bf60017036..e4f750d8c1 100644 --- a/common/djangoapps/status/tests.py +++ b/common/djangoapps/status/tests.py @@ -36,7 +36,6 @@ class TestStatus(TestCase): "edX/toy/2012_Fall" : "A toy story" }""" - # json to use, expected results for course=None (e.g. homepage), # for toy course, for full course. Note that get_site_status_msg # is supposed to return global message even if course=None. The diff --git a/common/djangoapps/student/migrations/0041_add_dashboard_config.py b/common/djangoapps/student/migrations/0041_add_dashboard_config.py index 13c10d584a..dbf6da578c 100644 --- a/common/djangoapps/student/migrations/0041_add_dashboard_config.py +++ b/common/djangoapps/student/migrations/0041_add_dashboard_config.py @@ -18,12 +18,10 @@ class Migration(SchemaMigration): )) db.send_create_signal('student', ['DashboardConfiguration']) - def backwards(self, orm): # Deleting model 'DashboardConfiguration' db.delete_table('student_dashboardconfiguration') - models = { 'auth.group': { 'Meta': {'object_name': 'Group'}, diff --git a/common/djangoapps/terrain/stubs/ora.py b/common/djangoapps/terrain/stubs/ora.py index 1cf2ae43ba..1edf93c484 100644 --- a/common/djangoapps/terrain/stubs/ora.py +++ b/common/djangoapps/terrain/stubs/ora.py @@ -300,7 +300,6 @@ class StubOraHandler(StubHttpRequestHandler): """ self._success_response({'problem_list': self.server.problem_list}) - @require_params('POST', 'grader_id', 'location', 'submission_id', 'score', 'feedback', 'submission_key') def _save_grade(self): """ @@ -421,7 +420,6 @@ class StubOraHandler(StubHttpRequestHandler): ) self.send_response(400) - def _student(self, method, key='student_id'): """ Return the `StudentState` instance for the student ID given diff --git a/common/lib/capa/capa/correctmap.py b/common/lib/capa/capa/correctmap.py index df7efee343..ff6e9ed142 100644 --- a/common/lib/capa/capa/correctmap.py +++ b/common/lib/capa/capa/correctmap.py @@ -165,7 +165,6 @@ class CorrectMap(object): self.cmap.update(other_cmap.get_dict()) self.set_overall_message(other_cmap.get_overall_message()) - def set_overall_message(self, message_str): """ Set a message that applies to the question as a whole, rather than to individual inputs. """ diff --git a/common/lib/capa/capa/customrender.py b/common/lib/capa/capa/customrender.py index 24f8d9b9ec..f56f963577 100644 --- a/common/lib/capa/capa/customrender.py +++ b/common/lib/capa/capa/customrender.py @@ -50,7 +50,6 @@ class MathRenderer(object): mathstr = mathstr.replace(r'\displaystyle', '') self.mathstr = mathstr.replace('mathjaxinline]', '%s]' % mtag) - def get_html(self): """ Return the contents of this tag, rendered to html, as an etree element. diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py index 0660340b41..f54a02ca03 100644 --- a/common/lib/capa/capa/inputtypes.py +++ b/common/lib/capa/capa/inputtypes.py @@ -839,7 +839,6 @@ class MatlabInput(CodeInput): 'No response from Xqueue within {xqueue_timeout} seconds. Aborted.' ).format(xqueue_timeout=XQUEUE_TIMEOUT) - def handle_ajax(self, dispatch, data): """ Handle AJAX calls directed to this input diff --git a/common/lib/capa/capa/tests/test_inputtypes.py b/common/lib/capa/capa/tests/test_inputtypes.py index 8d02edd4e8..b53ce496f4 100644 --- a/common/lib/capa/capa/tests/test_inputtypes.py +++ b/common/lib/capa/capa/tests/test_inputtypes.py @@ -604,7 +604,6 @@ class MatlabTest(unittest.TestCase): the_input = self.input_class(test_capa_system(), elt, state) self.assertEqual(the_input.status, 'queued') - @patch('capa.inputtypes.time.time', return_value=45) def test_matlab_response_timeout_exceeded(self, time): diff --git a/common/lib/capa/capa/tests/test_responsetypes.py b/common/lib/capa/capa/tests/test_responsetypes.py index c1124d187b..970e3ea58e 100644 --- a/common/lib/capa/capa/tests/test_responsetypes.py +++ b/common/lib/capa/capa/tests/test_responsetypes.py @@ -606,7 +606,6 @@ class StringResponseTest(ResponseTest): self.assert_grade(problem, u"î", "incorrect") self.assert_grade(problem, u"o", "incorrect") - def test_backslash_and_unicode_regexps(self): """ Test some special cases of [unicode] regexps. @@ -1042,8 +1041,6 @@ class CodeResponseTest(ResponseTest): self.assertEquals(output[answer_id]['msg'], u'Invalid grader reply. Please contact the course staff.') - - class ChoiceResponseTest(ResponseTest): from capa.tests.response_xml_factory import ChoiceResponseXMLFactory xml_factory_class = ChoiceResponseXMLFactory diff --git a/common/lib/capa/capa/tests/test_util.py b/common/lib/capa/capa/tests/test_util.py index 42c8975cd1..87ef04eaaa 100644 --- a/common/lib/capa/capa/tests/test_util.py +++ b/common/lib/capa/capa/tests/test_util.py @@ -82,7 +82,6 @@ class UtilTest(unittest.TestCase): result = compare_with_tolerance(infinity, infinity, '1.0', False) self.assertTrue(result) - def test_sanitize_html(self): """ Test for html sanitization with bleach. diff --git a/common/lib/chem/chem/chemcalc.py b/common/lib/chem/chem/chemcalc.py index 612e63c0f0..930c5818f4 100644 --- a/common/lib/chem/chem/chemcalc.py +++ b/common/lib/chem/chem/chemcalc.py @@ -192,7 +192,6 @@ def _render_to_html(tree): return children.replace(' ', '') - def render_to_html(eq): ''' Render a chemical equation string to html. @@ -231,7 +230,6 @@ def render_to_html(eq): # only one side return spanify(render_expression(left)) - return spanify(render_expression(left) + render_arrow(arrow) + render_expression(right)) diff --git a/common/lib/chem/chem/tests.py b/common/lib/chem/chem/tests.py index f422fcf0d1..4f000eb3f2 100644 --- a/common/lib/chem/chem/tests.py +++ b/common/lib/chem/chem/tests.py @@ -64,7 +64,6 @@ class Test_Compare_Equations(unittest.TestCase): self.assertFalse(chemical_equations_equal('H2O( -> H2O2', 'H2O -> H2O2')) - self.assertFalse(chemical_equations_equal('H2 + O2 ==> H2O2', # strange arrow '2O2 + 2H2 -> 2H2O2')) diff --git a/common/lib/symmath/symmath/formula.py b/common/lib/symmath/symmath/formula.py index 5d25ad5052..4da7cdc71c 100644 --- a/common/lib/symmath/symmath/formula.py +++ b/common/lib/symmath/symmath/formula.py @@ -257,7 +257,6 @@ class formula(object): fix_pmathml(xml) - def fix_hat(xml): """ hat i is turned into i^ ; mangle diff --git a/common/lib/xmodule/xmodule/exceptions.py b/common/lib/xmodule/xmodule/exceptions.py index 75be380581..a6d3686ca2 100644 --- a/common/lib/xmodule/xmodule/exceptions.py +++ b/common/lib/xmodule/xmodule/exceptions.py @@ -48,7 +48,6 @@ class HeartbeatFailure(Exception): def __unicode__(self, *args, **kwargs): return self.message - def __init__(self, msg, service): """ In addition to a msg, provide the name of the service. diff --git a/common/lib/xmodule/xmodule/lti_module.py b/common/lib/xmodule/xmodule/lti_module.py index d929e91e86..2cf31195e6 100644 --- a/common/lib/xmodule/xmodule/lti_module.py +++ b/common/lib/xmodule/xmodule/lti_module.py @@ -752,7 +752,6 @@ oauth_consumer_key="", oauth_signature="frVp4JuvT1mVXlxktiAUjQ7%2F1cw%3D"'} log.debug("[LTI]: Incorrect action.") return Response(response_xml_template.format(**unsupported_values), content_type='application/xml') - @classmethod def parse_grade_xml_body(cls, body): """ diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/__init__.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/__init__.py index 9582fb88c6..06ae542506 100644 --- a/common/lib/xmodule/xmodule/modulestore/split_mongo/__init__.py +++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/__init__.py @@ -14,7 +14,6 @@ class BlockKey(namedtuple('BlockKey', 'type id')): def __new__(cls, type, id): return super(BlockKey, cls).__new__(cls, type, id) - @classmethod @contract(usage_key=BlockUsageLocator) def from_usage_key(cls, usage_key): diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/split_mongo_kvs.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/split_mongo_kvs.py index 0eb4e822f5..3a7766881e 100644 --- a/common/lib/xmodule/xmodule/modulestore/split_mongo/split_mongo_kvs.py +++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/split_mongo_kvs.py @@ -38,7 +38,6 @@ class SplitMongoKVS(InheritanceKeyValueStore): self.parent = parent - def get(self, key): # load the field, if needed if key.field_name not in self._fields: diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore_settings.py b/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore_settings.py index 56cf3bd46e..dea9ee8d52 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore_settings.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore_settings.py @@ -115,7 +115,6 @@ class ModuleStoreSettingsMigration(TestCase): } } - def assertStoreValuesEqual(self, store_setting1, store_setting2): """ Tests whether the fields in the given store_settings are equal. diff --git a/common/lib/xmodule/xmodule/modulestore/xml_exporter.py b/common/lib/xmodule/xmodule/modulestore/xml_exporter.py index 376dc7dc32..d689ed51ad 100644 --- a/common/lib/xmodule/xmodule/modulestore/xml_exporter.py +++ b/common/lib/xmodule/xmodule/modulestore/xml_exporter.py @@ -188,7 +188,6 @@ def adapt_references(subtree, destination_course_key, export_fs): ) - def _export_field_content(xblock_item, item_dir): """ Export all fields related to 'xblock_item' other than 'metadata' and 'data' to json file in provided directory diff --git a/common/lib/xmodule/xmodule/randomize_module.py b/common/lib/xmodule/xmodule/randomize_module.py index 6827a68c35..b0d9b8de6d 100644 --- a/common/lib/xmodule/xmodule/randomize_module.py +++ b/common/lib/xmodule/xmodule/randomize_module.py @@ -77,7 +77,6 @@ class RandomizeModule(RandomizeFields, XModule): return [self.child_descriptor] - def student_view(self, context): if self.child is None: # raise error instead? In fact, could complain on descriptor load... @@ -95,7 +94,6 @@ class RandomizeDescriptor(RandomizeFields, SequenceDescriptor): filename_extension = "xml" - def definition_to_xml(self, resource_fs): xml_object = etree.Element('randomize') diff --git a/common/lib/xmodule/xmodule/template_module.py b/common/lib/xmodule/xmodule/template_module.py index 34ba8f6c69..7587ae8e43 100644 --- a/common/lib/xmodule/xmodule/template_module.py +++ b/common/lib/xmodule/xmodule/template_module.py @@ -60,7 +60,6 @@ class CustomTagDescriptor(RawDescriptor): template = Template(template_module_data) return template.render(**params) - @property def rendered_html(self): return self.render_template(self.system, self.data) diff --git a/common/lib/xmodule/xmodule/tests/test_bulk_assertions.py b/common/lib/xmodule/xmodule/tests/test_bulk_assertions.py index a6a2860a4e..f930b6b5d4 100644 --- a/common/lib/xmodule/xmodule/tests/test_bulk_assertions.py +++ b/common/lib/xmodule/xmodule/tests/test_bulk_assertions.py @@ -22,7 +22,6 @@ class TestBulkAssertionTestCase(BulkAssertionTest): def test_passing_asserts_passthrough(self, assertion, *args): getattr(self, assertion)(*args) - @ddt.data( ('assertTrue', False), ('assertFalse', True), diff --git a/common/lib/xmodule/xmodule/tests/test_capa_module.py b/common/lib/xmodule/xmodule/tests/test_capa_module.py index 06ea77d152..045af6d390 100644 --- a/common/lib/xmodule/xmodule/tests/test_capa_module.py +++ b/common/lib/xmodule/xmodule/tests/test_capa_module.py @@ -1395,7 +1395,6 @@ class CapaModuleTest(unittest.TestCase): Run the test for each possible rerandomize value """ - def _reset_and_get_seed(module): """ Reset the XModule and return the module's seed diff --git a/common/lib/xmodule/xmodule/tests/test_import.py b/common/lib/xmodule/xmodule/tests/test_import.py index 92741c6ba5..2d7518b1c6 100644 --- a/common/lib/xmodule/xmodule/tests/test_import.py +++ b/common/lib/xmodule/xmodule/tests/test_import.py @@ -150,7 +150,6 @@ class ImportTestCase(BaseCourseTestCase): self.assertNotEqual(descriptor1.location, descriptor2.location) - def test_reimport(self): '''Make sure an already-exported error xml tag loads properly''' diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py index cf5b9fff19..3a7d5699d1 100644 --- a/common/lib/xmodule/xmodule/x_module.py +++ b/common/lib/xmodule/xmodule/x_module.py @@ -211,7 +211,6 @@ class XModuleMixin(XBlockMixin): def runtime(self, value): self._runtime = value - @property def system(self): """ @@ -719,7 +718,6 @@ class XModuleDescriptor(XModuleMixin, HTMLSnippet, ResourceTemplates, XBlock): entry_point = "xmodule.v1" module_class = XModule - # VS[compat]. Backwards compatibility code that can go away after # importing 2012 courses. # A set of metadata key conversions that we want to make @@ -835,7 +833,6 @@ class XModuleDescriptor(XModuleMixin, HTMLSnippet, ResourceTemplates, XBlock): """ pass - # =============================== BUILTIN METHODS ========================== def __eq__(self, other): return (self.scope_ids == other.scope_ids and diff --git a/common/test/acceptance/tests/test_annotatable.py b/common/test/acceptance/tests/test_annotatable.py index 24780369cc..692313fd17 100644 --- a/common/test/acceptance/tests/test_annotatable.py +++ b/common/test/acceptance/tests/test_annotatable.py @@ -29,7 +29,6 @@ class AnnotatableProblemTest(UniqueCourseTest): USERNAME = "STAFF_TESTER" EMAIL = "johndoe@example.com" - DATA_TEMPLATE = dedent("""\ Instruction text diff --git a/common/xml_cleanup.py b/common/xml_cleanup.py index 5f2b527063..9fc8fd00f6 100755 --- a/common/xml_cleanup.py +++ b/common/xml_cleanup.py @@ -86,7 +86,6 @@ def cleanup(filepath, remove_meta): if attr in attrs: del attrs[attr] - with open(filepath, "w") as f: f.write(etree.tostring(xml)) diff --git a/docs/en_us/developers/source/conf.py b/docs/en_us/developers/source/conf.py index a3b9d6a01a..724bee93f2 100644 --- a/docs/en_us/developers/source/conf.py +++ b/docs/en_us/developers/source/conf.py @@ -10,7 +10,6 @@ from path import path on_rtd = os.environ.get('READTHEDOCS', None) == 'True' - sys.path.append('../../../../') from docs.shared.conf import * @@ -188,7 +187,6 @@ def strip_tags(html): return s.get_data() - def process_docstring(app, what, name, obj, options, lines): """Autodoc django models""" diff --git a/docs/en_us/platform_api/source/conf.py b/docs/en_us/platform_api/source/conf.py index b0fcd45019..204089f741 100644 --- a/docs/en_us/platform_api/source/conf.py +++ b/docs/en_us/platform_api/source/conf.py @@ -179,7 +179,6 @@ def strip_tags(html): return s.get_data() - def process_docstring(app, what, name, obj, options, lines): """Autodoc django models""" diff --git a/docs/shared/conf.py b/docs/shared/conf.py index 1659291e99..f020c247cd 100644 --- a/docs/shared/conf.py +++ b/docs/shared/conf.py @@ -36,7 +36,6 @@ def add_base(paths): return [os.path.join(BASEDIR, x) for x in paths] - # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. diff --git a/lms/djangoapps/bulk_email/migrations/0010_auto__chg_field_optout_course_id__add_field_courseemail_template_name_.py b/lms/djangoapps/bulk_email/migrations/0010_auto__chg_field_optout_course_id__add_field_courseemail_template_name_.py index b9d77f7dd0..3e55dfb226 100644 --- a/lms/djangoapps/bulk_email/migrations/0010_auto__chg_field_optout_course_id__add_field_courseemail_template_name_.py +++ b/lms/djangoapps/bulk_email/migrations/0010_auto__chg_field_optout_course_id__add_field_courseemail_template_name_.py @@ -21,7 +21,6 @@ class Migration(SchemaMigration): self.gf('django.db.models.fields.CharField')(max_length=255, null=True), keep_default=False) - # Changing field 'CourseEmail.course_id' db.alter_column('bulk_email_courseemail', 'course_id', self.gf('xmodule_django.models.CourseKeyField')(max_length=255)) # Adding field 'CourseEmailTemplate.name' @@ -29,7 +28,6 @@ class Migration(SchemaMigration): self.gf('django.db.models.fields.CharField')(max_length=255, unique=True, null=True), keep_default=False) - # Changing field 'CourseAuthorization.course_id' db.alter_column('bulk_email_courseauthorization', 'course_id', self.gf('xmodule_django.models.CourseKeyField')(unique=True, max_length=255)) @@ -43,13 +41,11 @@ class Migration(SchemaMigration): # Deleting field 'CourseEmail.from_addr' db.delete_column('bulk_email_courseemail', 'from_addr') - # Changing field 'CourseEmail.course_id' db.alter_column('bulk_email_courseemail', 'course_id', self.gf('django.db.models.fields.CharField')(max_length=255)) # Deleting field 'CourseEmailTemplate.name' db.delete_column('bulk_email_courseemailtemplate', 'name') - # Changing field 'CourseAuthorization.course_id' db.alter_column('bulk_email_courseauthorization', 'course_id', self.gf('django.db.models.fields.CharField')(max_length=255, unique=True)) diff --git a/lms/djangoapps/courseware/tests/test_model_data.py b/lms/djangoapps/courseware/tests/test_model_data.py index 185806411f..f2f3fe532b 100644 --- a/lms/djangoapps/courseware/tests/test_model_data.py +++ b/lms/djangoapps/courseware/tests/test_model_data.py @@ -238,7 +238,6 @@ class StorageTestBase(object): self.field_data_cache = FieldDataCache([self.mock_descriptor], course_id, self.user) self.kvs = DjangoKeyValueStore(self.field_data_cache) - def test_set_and_get_existing_field(self): self.kvs.set(self.key_factory('existing_field'), 'test_value') self.assertEquals('test_value', self.kvs.get(self.key_factory('existing_field'))) diff --git a/lms/djangoapps/lms_migration/management/commands/create_user.py b/lms/djangoapps/lms_migration/management/commands/create_user.py index 5d96d96a8a..10051b349c 100644 --- a/lms/djangoapps/lms_migration/management/commands/create_user.py +++ b/lms/djangoapps/lms_migration/management/commands/create_user.py @@ -98,7 +98,6 @@ class Command(BaseCommand): name = raw_input('Full name: ') - user = User(username=uname, email=email, is_active=True) user.set_password(password) try: diff --git a/lms/djangoapps/lms_migration/migrate.py b/lms/djangoapps/lms_migration/migrate.py index daa30d8645..ee6f715fb6 100644 --- a/lms/djangoapps/lms_migration/migrate.py +++ b/lms/djangoapps/lms_migration/migrate.py @@ -147,7 +147,6 @@ def manage_modulestores(request, reload_dir=None, commit_id=None): else: html += '' % escape(data) - #---------------------------------------- html += '
' diff --git a/lms/djangoapps/notification_prefs/views.py b/lms/djangoapps/notification_prefs/views.py index 6bcb60a489..4df6465830 100644 --- a/lms/djangoapps/notification_prefs/views.py +++ b/lms/djangoapps/notification_prefs/views.py @@ -144,7 +144,6 @@ def ajax_status(request): if not request.user.is_authenticated(): raise PermissionDenied - qs = UserPreference.objects.filter( user=request.user, key=NOTIFICATION_PREF_KEY diff --git a/lms/djangoapps/shoppingcart/migrations/0018_auto__add_donation.py b/lms/djangoapps/shoppingcart/migrations/0018_auto__add_donation.py index fd89917904..012e7e2d4c 100644 --- a/lms/djangoapps/shoppingcart/migrations/0018_auto__add_donation.py +++ b/lms/djangoapps/shoppingcart/migrations/0018_auto__add_donation.py @@ -16,12 +16,10 @@ class Migration(SchemaMigration): )) db.send_create_signal('shoppingcart', ['Donation']) - def backwards(self, orm): # Deleting model 'Donation' db.delete_table('shoppingcart_donation') - models = { 'auth.group': { 'Meta': {'object_name': 'Group'}, diff --git a/lms/djangoapps/shoppingcart/migrations/0019_auto__add_donationconfiguration.py b/lms/djangoapps/shoppingcart/migrations/0019_auto__add_donationconfiguration.py index 78c0bdde14..d7364612bc 100644 --- a/lms/djangoapps/shoppingcart/migrations/0019_auto__add_donationconfiguration.py +++ b/lms/djangoapps/shoppingcart/migrations/0019_auto__add_donationconfiguration.py @@ -17,12 +17,10 @@ class Migration(SchemaMigration): )) db.send_create_signal('shoppingcart', ['DonationConfiguration']) - def backwards(self, orm): # Deleting model 'DonationConfiguration' db.delete_table('shoppingcart_donationconfiguration') - models = { 'auth.group': { 'Meta': {'object_name': 'Group'}, diff --git a/lms/djangoapps/shoppingcart/migrations/0020_auto__add_courseregcodeitem__add_courseregcodeitemannotation__add_fiel.py b/lms/djangoapps/shoppingcart/migrations/0020_auto__add_courseregcodeitem__add_courseregcodeitemannotation__add_fiel.py index 941fcd0100..af49f01c0a 100644 --- a/lms/djangoapps/shoppingcart/migrations/0020_auto__add_courseregcodeitem__add_courseregcodeitemannotation__add_fiel.py +++ b/lms/djangoapps/shoppingcart/migrations/0020_auto__add_courseregcodeitem__add_courseregcodeitemannotation__add_fiel.py @@ -59,7 +59,6 @@ class Migration(SchemaMigration): self.gf('django.db.models.fields.CharField')(default='personal', max_length=32), keep_default=False) - def backwards(self, orm): # Deleting model 'CourseRegCodeItem' db.delete_table('shoppingcart_courseregcodeitem') @@ -88,7 +87,6 @@ class Migration(SchemaMigration): # Deleting field 'Order.order_type' db.delete_column('shoppingcart_order', 'order_type') - models = { 'auth.group': { 'Meta': {'object_name': 'Group'}, diff --git a/lms/djangoapps/shoppingcart/migrations/0021_auto__add_field_orderitem_created__add_field_orderitem_modified.py b/lms/djangoapps/shoppingcart/migrations/0021_auto__add_field_orderitem_created__add_field_orderitem_modified.py index c4ca4bc4c8..226d2475e8 100644 --- a/lms/djangoapps/shoppingcart/migrations/0021_auto__add_field_orderitem_created__add_field_orderitem_modified.py +++ b/lms/djangoapps/shoppingcart/migrations/0021_auto__add_field_orderitem_created__add_field_orderitem_modified.py @@ -18,7 +18,6 @@ class Migration(SchemaMigration): self.gf('model_utils.fields.AutoLastModifiedField')(default=datetime.datetime.now), keep_default=False) - def backwards(self, orm): # Deleting field 'OrderItem.created' db.delete_column('shoppingcart_orderitem', 'created') @@ -26,7 +25,6 @@ class Migration(SchemaMigration): # Deleting field 'OrderItem.modified' db.delete_column('shoppingcart_orderitem', 'modified') - models = { 'auth.group': { 'Meta': {'object_name': 'Group'}, diff --git a/lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py b/lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py index f8120f911c..d719e06f89 100644 --- a/lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py +++ b/lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py @@ -263,7 +263,6 @@ class CyberSourceTests(TestCase): # finally, tests an accepted order self.assertTrue(payment_accepted(params)['accepted']) - @patch('shoppingcart.processors.CyberSource.render_to_string', autospec=True) def test_render_purchase_form_html(self, render): """ diff --git a/lms/djangoapps/verify_student/models.py b/lms/djangoapps/verify_student/models.py index d731483ad0..f7c2a2b17d 100644 --- a/lms/djangoapps/verify_student/models.py +++ b/lms/djangoapps/verify_student/models.py @@ -310,7 +310,6 @@ class PhotoVerification(StatusModel): return (status, error_msg) - def parsed_error_msg(self): """ Sometimes, the error message we've received needs to be parsed into @@ -777,7 +776,6 @@ class SoftwareSecurePhotoVerification(PhotoVerification): return header_txt + "\n\n" + body_txt - def send_request(self): """ Assembles a submission to Software Secure and sends it via HTTPS. diff --git a/pavelib/paver_tests/test_paver_get_quality_reports.py b/pavelib/paver_tests/test_paver_get_quality_reports.py index 75352bed0c..a1cde45300 100644 --- a/pavelib/paver_tests/test_paver_get_quality_reports.py +++ b/pavelib/paver_tests/test_paver_get_quality_reports.py @@ -9,7 +9,6 @@ import paver.easy from paver.easy import BuildFailure - class TestGetReportFiles(unittest.TestCase): """ Ensure only the report files we want are returned as part of run_quality. diff --git a/pavelib/utils/test/suites/acceptance_suite.py b/pavelib/utils/test/suites/acceptance_suite.py index 36bb0c083b..d33ee744fe 100644 --- a/pavelib/utils/test/suites/acceptance_suite.py +++ b/pavelib/utils/test/suites/acceptance_suite.py @@ -95,7 +95,6 @@ class AcceptanceTestSuite(TestSuite): if not self.fasttest: self._setup_acceptance_db() - def _setup_acceptance_db(self): """ TODO: Improve the following