s/pylint: disable=W0621/pylint: disable=redefined-outer-name/

cms/djangoapps/contentstore/features/advanced_settings.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from nose.tools import assert_false, assert_equal, assert_regexp_matches  # pylint: disable=E0611

cms/djangoapps/contentstore/features/checklists.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from nose.tools import assert_true, assert_equal  # pylint: disable=E0611

cms/djangoapps/contentstore/features/common.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 import os
 from lettuce import world, step

cms/djangoapps/contentstore/features/component.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 # Lettuce formats proposed definitions for unimplemented steps with the
 # argument name "step" instead of "_step" and pylint does not like that.

cms/djangoapps/contentstore/features/course-export.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 # pylint: disable=W0613
 
 from lettuce import world, step

cms/djangoapps/contentstore/features/course-outline.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from common import *

cms/djangoapps/contentstore/features/course-settings.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from terrain.steps import reload_the_page

cms/djangoapps/contentstore/features/course-team.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from nose.tools import assert_in  # pylint: disable=E0611

cms/djangoapps/contentstore/features/course-updates.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from selenium.webdriver.common.keys import Keys

cms/djangoapps/contentstore/features/course_import.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 # pylint: disable=W0613
 
 import os

cms/djangoapps/contentstore/features/courses.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from common import *

cms/djangoapps/contentstore/features/grading.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from common import *

cms/djangoapps/contentstore/features/help.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 # pylint: disable=W0613
 
 from nose.tools import assert_false  # pylint: disable=no-name-in-module

cms/djangoapps/contentstore/features/pages.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 # pylint: disable=W0613
 
 from lettuce import world, step

cms/djangoapps/contentstore/features/signup.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 

cms/djangoapps/contentstore/features/textbooks.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from django.conf import settings

cms/djangoapps/contentstore/features/upload.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from lettuce.django import django_url

cms/djangoapps/course_creators/migrations/0001_initial.py

@@ -71,4 +71,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['course_creators']
\ No newline at end of file
+    complete_apps = ['course_creators']

common/djangoapps/course_action_state/migrations/0001_initial.py

@@ -89,4 +89,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['course_action_state']
\ No newline at end of file
+    complete_apps = ['course_action_state']

common/djangoapps/course_modes/migrations/0001_initial.py

@@ -37,4 +37,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['course_modes']
\ No newline at end of file
+    complete_apps = ['course_modes']

common/djangoapps/course_modes/migrations/0002_auto__add_field_coursemode_currency.py

@@ -32,4 +32,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['course_modes']
\ No newline at end of file
+    complete_apps = ['course_modes']

common/djangoapps/course_modes/migrations/0003_auto__add_unique_coursemode_course_id_currency_mode_slug.py

@@ -30,4 +30,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['course_modes']
\ No newline at end of file
+    complete_apps = ['course_modes']

common/djangoapps/course_modes/migrations/0004_auto__add_field_coursemode_expiration_date.py

@@ -33,4 +33,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['course_modes']
\ No newline at end of file
+    complete_apps = ['course_modes']

common/djangoapps/course_modes/migrations/0005_auto__add_field_coursemode_expiration_datetime.py

@@ -34,4 +34,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['course_modes']
\ No newline at end of file
+    complete_apps = ['course_modes']

common/djangoapps/course_modes/migrations/0007_add_description.py

@@ -41,4 +41,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['course_modes']
\ No newline at end of file
+    complete_apps = ['course_modes']

common/djangoapps/course_modes/migrations/0007_auto__add_coursemodesarchive__chg_field_coursemode_course_id.py

@@ -61,4 +61,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['course_modes']
\ No newline at end of file
+    complete_apps = ['course_modes']

common/djangoapps/dark_lang/migrations/0001_initial.py

@@ -71,4 +71,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['dark_lang']
\ No newline at end of file
+    complete_apps = ['dark_lang']

common/djangoapps/embargo/migrations/0001_initial.py

@@ -111,4 +111,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['embargo']
\ No newline at end of file
+    complete_apps = ['embargo']

common/djangoapps/external_auth/migrations/0001_initial.py

@@ -87,4 +87,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['external_auth']
\ No newline at end of file
+    complete_apps = ['external_auth']

common/djangoapps/reverification/migrations/0001_initial.py

@@ -33,4 +33,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['reverification']
\ No newline at end of file
+    complete_apps = ['reverification']

common/djangoapps/student/migrations/0025_auto__add_field_courseenrollmentallowed_auto_enroll.py

@@ -170,4 +170,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['student']
\ No newline at end of file
+    complete_apps = ['student']

common/djangoapps/student/migrations/0027_add_active_flag_and_mode_to_courseware_enrollment.py

@@ -180,4 +180,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['student']
\ No newline at end of file
+    complete_apps = ['student']

common/djangoapps/student/migrations/0028_auto__add_userstanding.py

@@ -185,4 +185,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['student']
\ No newline at end of file
+    complete_apps = ['student']

common/djangoapps/student/migrations/0029_add_lookup_table_between_user_and_anonymous_student_id.py

@@ -191,4 +191,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['student']
\ No newline at end of file
+    complete_apps = ['student']

common/djangoapps/student/migrations/0029_remove_pearson.py

@@ -182,4 +182,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['student']
\ No newline at end of file
+    complete_apps = ['student']

common/djangoapps/student/migrations/0032_add_field_UserProfile_country_add_field_UserProfile_city.py

@@ -143,4 +143,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['student']
\ No newline at end of file
+    complete_apps = ['student']

common/djangoapps/student/migrations/0033_auto__add_passwordhistory.py

@@ -153,4 +153,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['student']
\ No newline at end of file
+    complete_apps = ['student']

common/djangoapps/student/migrations/0034_auto__add_courseaccessrole.py

@@ -186,4 +186,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['student']
\ No newline at end of file
+    complete_apps = ['student']

common/djangoapps/student/migrations/0037_auto__add_courseregistrationcode.py

@@ -176,4 +176,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['student']
\ No newline at end of file
+    complete_apps = ['student']

common/djangoapps/student/migrations/0038_auto__add_usersignupsource.py

@@ -177,4 +177,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['student']
\ No newline at end of file
+    complete_apps = ['student']

common/djangoapps/student/migrations/0039_auto__del_courseregistrationcode.py

@@ -171,4 +171,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['student']
\ No newline at end of file
+    complete_apps = ['student']

common/djangoapps/student/migrations/0040_auto__del_field_usersignupsource_user_id__add_field_usersignupsource_u.py

@@ -169,4 +169,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['student']
\ No newline at end of file
+    complete_apps = ['student']

common/djangoapps/terrain/course_helpers.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 import urllib
 from lettuce import world

common/djangoapps/terrain/steps.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 # Disable the "wildcard import" warning so we can bring in all methods from
 # course helpers and ui helpers

common/djangoapps/terrain/ui_helpers.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world
 

common/djangoapps/user_api/migrations/0001_initial.py

@@ -75,4 +75,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['user_api']
\ No newline at end of file
+    complete_apps = ['user_api']

common/djangoapps/user_api/migrations/0002_auto__add_usercoursetags__add_unique_usercoursetags_user_course_id_key.py

@@ -84,4 +84,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['user_api']
\ No newline at end of file
+    complete_apps = ['user_api']

common/djangoapps/user_api/migrations/0003_rename_usercoursetags.py

@@ -69,4 +69,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['user_api']
\ No newline at end of file
+    complete_apps = ['user_api']

lms/djangoapps/bulk_email/migrations/0008_add_course_authorizations.py

@@ -92,4 +92,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['bulk_email']
\ No newline at end of file
+    complete_apps = ['bulk_email']

lms/djangoapps/bulk_email/migrations/0009_force_unique_course_ids.py

@@ -87,4 +87,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['bulk_email']
\ No newline at end of file
+    complete_apps = ['bulk_email']

lms/djangoapps/certificates/migrations/0015_adding_mode_for_verified_certs.py

@@ -83,4 +83,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['certificates']
\ No newline at end of file
+    complete_apps = ['certificates']

lms/djangoapps/courseware/features/certificates.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from lettuce.django import django_url

lms/djangoapps/courseware/features/common.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from __future__ import absolute_import
 

lms/djangoapps/courseware/features/conditional.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, steps
 from nose.tools import assert_in, assert_true  # pylint: disable=no-name-in-module

lms/djangoapps/courseware/features/courseware.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from lettuce.django import django_url

lms/djangoapps/courseware/features/courseware_common.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 # pylint: disable=unused-argument
 
 from lettuce import world, step

lms/djangoapps/courseware/features/homepage.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from nose.tools import assert_equals, assert_greater  # pylint: disable=E0611

lms/djangoapps/courseware/features/login.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import step, world
 from django.contrib.auth.models import User

lms/djangoapps/courseware/features/navigation.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from common import course_location

lms/djangoapps/courseware/features/openended.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from lettuce.django import django_url

lms/djangoapps/courseware/features/problems.py

@@ -3,7 +3,7 @@ Steps for problem.feature lettuce tests
 '''
 
 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from common import i_am_registered_for_the_course, visit_scenario_item

lms/djangoapps/courseware/features/problems_setup.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 # EVERY PROBLEM TYPE MUST HAVE THE FOLLOWING:
 # -Section in Dictionary containing:

lms/djangoapps/courseware/features/registration.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from lettuce.django import django_url

lms/djangoapps/courseware/features/signup.py

 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 

lms/djangoapps/courseware/migrations/0006_create_student_module_history.py

@@ -106,4 +106,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['courseware']
\ No newline at end of file
+    complete_apps = ['courseware']

lms/djangoapps/courseware/migrations/0007_allow_null_version_in_history.py

@@ -97,4 +97,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['courseware']
\ No newline at end of file
+    complete_apps = ['courseware']

lms/djangoapps/courseware/migrations/0008_add_xmodule_storage.py

@@ -182,4 +182,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['courseware']
\ No newline at end of file
+    complete_apps = ['courseware']

lms/djangoapps/courseware/migrations/0009_add_field_default.py

@@ -125,4 +125,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['courseware']
\ No newline at end of file
+    complete_apps = ['courseware']

lms/djangoapps/courseware/migrations/0010_rename_xblock_field_content_to_user_state_summary.py

@@ -145,4 +145,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['courseware']
\ No newline at end of file
+    complete_apps = ['courseware']

lms/djangoapps/foldit/migrations/0001_initial.py

@@ -108,4 +108,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['foldit']
\ No newline at end of file
+    complete_apps = ['foldit']

lms/djangoapps/instructor/features/bulk_email.py

@@ -3,7 +3,7 @@ Define steps for bulk email acceptance test.
 """
 
 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from lettuce.django import mail

lms/djangoapps/instructor/features/common.py

@@ -3,7 +3,7 @@ Define common steps for instructor dashboard acceptance tests.
 """
 
 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from __future__ import absolute_import
 

lms/djangoapps/instructor/features/data_download.py

@@ -4,7 +4,7 @@ acceptance tests.
 """
 
 # pylint: disable=C0111
-# pylint: disable=W0621
+# pylint: disable=redefined-outer-name
 
 from lettuce import world, step
 from nose.tools import assert_in, assert_regexp_matches  # pylint: disable=E0611

lms/djangoapps/instructor/views/api.py

@@ -747,7 +747,7 @@ def get_grading_config(request, course_id):
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_level('staff')
-def get_sale_records(request, course_id, csv=False):  # pylint: disable=W0613, W0621
+def get_sale_records(request, course_id, csv=False):  # pylint: disable=W0613, redefined-outer-name
     """
     return the summary of all sales records for a particular course
     """
@@ -778,7 +778,7 @@ def get_sale_records(request, course_id, csv=False):  # pylint: disable=W0613, W
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_level('staff')
-def get_sale_order_records(request, course_id):  # pylint: disable=W0613, W0621
+def get_sale_order_records(request, course_id):  # pylint: disable=W0613, redefined-outer-name
     """
     return the summary of all sales records for a particular course
     """
@@ -878,7 +878,7 @@ def re_validate_invoice(obj_invoice):
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_level('staff')
-def get_purchase_transaction(request, course_id, csv=False):  # pylint: disable=W0613, W0621
+def get_purchase_transaction(request, course_id, csv=False):  # pylint: disable=W0613, redefined-outer-name
     """
     return the summary of all purchased transactions for a particular course
     """
@@ -906,7 +906,7 @@ def get_purchase_transaction(request, course_id, csv=False):  # pylint: disable=
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_level('staff')
-def get_students_features(request, course_id, csv=False):  # pylint: disable=W0613, W0621
+def get_students_features(request, course_id, csv=False):  # pylint: disable=W0613, redefined-outer-name
     """
     Respond with json which contains a summary of all enrolled students profile information.
 
@@ -1107,7 +1107,7 @@ def generate_registration_codes(request, course_id):
         internal_reference=internal_reference, customer_reference_number=customer_reference_number
     )
     registration_codes = []
-    for _ in range(course_code_number):  # pylint: disable=W0621
+    for _ in range(course_code_number):  # pylint: disable=redefined-outer-name
         generated_registration_code = save_registration_code(request.user, course_id, sale_invoice, order=None)
         registration_codes.append(generated_registration_code)
 

lms/djangoapps/instructor_task/migrations/0001_initial.py

@@ -83,4 +83,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['instructor_task']
\ No newline at end of file
+    complete_apps = ['instructor_task']

lms/djangoapps/instructor_task/migrations/0002_add_subtask_field.py

@@ -73,4 +73,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['instructor_task']
\ No newline at end of file
+    complete_apps = ['instructor_task']

lms/djangoapps/linkedin/migrations/0001_initial.py

@@ -67,4 +67,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['linkedin']
\ No newline at end of file
+    complete_apps = ['linkedin']

lms/djangoapps/notes/migrations/0001_initial.py

@@ -87,4 +87,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['notes']
\ No newline at end of file
+    complete_apps = ['notes']

lms/djangoapps/shoppingcart/migrations/0004_auto__add_field_orderitem_fulfilled_time.py

@@ -111,4 +111,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['shoppingcart']
\ No newline at end of file
+    complete_apps = ['shoppingcart']

lms/djangoapps/shoppingcart/migrations/0005_auto__add_paidcourseregistrationannotation__add_field_orderitem_report.py

@@ -129,4 +129,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['shoppingcart']
\ No newline at end of file
+    complete_apps = ['shoppingcart']

lms/djangoapps/shoppingcart/migrations/0006_auto__add_field_order_refunded_time__add_field_orderitem_refund_reques.py

@@ -128,4 +128,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['shoppingcart']
\ No newline at end of file
+    complete_apps = ['shoppingcart']

lms/djangoapps/shoppingcart/migrations/0007_auto__add_field_orderitem_service_fee.py

@@ -139,4 +139,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['shoppingcart']
\ No newline at end of file
+    complete_apps = ['shoppingcart']

lms/djangoapps/shoppingcart/migrations/0008_auto__add_coupons__add_couponredemption__chg_field_certificateitem_cou.py

@@ -186,4 +186,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['shoppingcart']
\ No newline at end of file
+    complete_apps = ['shoppingcart']

lms/djangoapps/shoppingcart/migrations/0009_auto__del_coupons__add_courseregistrationcode__add_coupon__chg_field_c.py

@@ -213,4 +213,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['shoppingcart']
\ No newline at end of file
+    complete_apps = ['shoppingcart']

lms/djangoapps/shoppingcart/migrations/0010_auto__add_registrationcoderedemption__del_field_courseregistrationcode.py

@@ -184,4 +184,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['shoppingcart']
\ No newline at end of file
+    complete_apps = ['shoppingcart']

lms/djangoapps/shoppingcart/migrations/0011_auto__add_invoice__add_field_courseregistrationcode_invoice.py

@@ -183,4 +183,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['shoppingcart']
\ No newline at end of file
+    complete_apps = ['shoppingcart']

lms/djangoapps/shoppingcart/migrations/0012_auto__del_field_courseregistrationcode_transaction_group_name__del_fie.py

@@ -249,4 +249,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['shoppingcart']
\ No newline at end of file
+    complete_apps = ['shoppingcart']

lms/djangoapps/shoppingcart/migrations/0013_auto__add_field_invoice_is_valid.py

@@ -170,4 +170,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['shoppingcart']
\ No newline at end of file
+    complete_apps = ['shoppingcart']

lms/djangoapps/shoppingcart/migrations/0014_auto__del_field_invoice_tax_id__add_field_invoice_address_line_1__add_.py

@@ -241,4 +241,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['shoppingcart']
\ No newline at end of file
+    complete_apps = ['shoppingcart']

lms/djangoapps/shoppingcart/migrations/0015_auto__del_field_invoice_purchase_order_number__del_field_invoice_compa.py

@@ -226,4 +226,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['shoppingcart']
\ No newline at end of file
+    complete_apps = ['shoppingcart']

lms/djangoapps/shoppingcart/migrations/0016_auto__del_field_invoice_company_email__del_field_invoice_company_refer.py

@@ -202,4 +202,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['shoppingcart']
\ No newline at end of file
+    complete_apps = ['shoppingcart']

lms/djangoapps/shoppingcart/migrations/0017_auto__add_field_courseregistrationcode_order__chg_field_registrationco.py

@@ -185,4 +185,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['shoppingcart']
\ No newline at end of file
+    complete_apps = ['shoppingcart']

lms/djangoapps/shoppingcart/tests/test_views.py

@@ -151,7 +151,7 @@ class ShoppingCartViewsTests(ModuleStoreTestCase):
         resp = self.client.get(billing_url)
         self.assertEqual(resp.status_code, 200)
 
-        ((template, context), _) = render_mock.call_args  # pylint: disable=W0621
+        ((template, context), _) = render_mock.call_args  # pylint: disable=redefined-outer-name
         self.assertEqual(template, 'shoppingcart/billing_details.html')
         # check for the default currency in the context
         self.assertEqual(context['currency'], 'usd')
@@ -179,7 +179,7 @@ class ShoppingCartViewsTests(ModuleStoreTestCase):
         resp = self.client.get(billing_url)
         self.assertEqual(resp.status_code, 200)
 
-        ((template, context), _) = render_mock.call_args  # pylint: disable=W0621
+        ((template, context), _) = render_mock.call_args  # pylint: disable=redefined-outer-name
         self.assertEqual(template, 'shoppingcart/billing_details.html')
         # check for the override currency settings in the context
         self.assertEqual(context['currency'], 'PKR')
@@ -669,7 +669,7 @@ class ShoppingCartViewsTests(ModuleStoreTestCase):
         resp = self.client.get(reverse('shoppingcart.views.show_cart', args=[]))
         self.assertEqual(resp.status_code, 200)
 
-        ((purchase_form_arg_cart,), _) = form_mock.call_args  # pylint: disable=W0621
+        ((purchase_form_arg_cart,), _) = form_mock.call_args  # pylint: disable=redefined-outer-name
         purchase_form_arg_cart_items = purchase_form_arg_cart.orderitem_set.all().select_subclasses()
         self.assertIn(reg_item, purchase_form_arg_cart_items)
         self.assertIn(cert_item, purchase_form_arg_cart_items)
@@ -693,7 +693,7 @@ class ShoppingCartViewsTests(ModuleStoreTestCase):
         resp = self.client.get(reverse('shoppingcart.views.show_cart', args=[]))
         self.assertEqual(resp.status_code, 200)
 
-        ((purchase_form_arg_cart,), _) = form_mock.call_args  # pylint: disable=W0621
+        ((purchase_form_arg_cart,), _) = form_mock.call_args  # pylint: disable=redefined-outer-name
         purchase_form_arg_cart_items = purchase_form_arg_cart.orderitem_set.all().select_subclasses()
         self.assertIn(reg_item, purchase_form_arg_cart_items)
 
@@ -849,7 +849,7 @@ class ShoppingCartViewsTests(ModuleStoreTestCase):
         resp = self.client.get(reverse('shoppingcart.views.show_receipt', args=[self.cart.id]))
         self.assertEqual(resp.status_code, 200)
 
-        ((template, context), _) = render_mock.call_args  # pylint: disable=W0621
+        ((template, context), _) = render_mock.call_args  # pylint: disable=redefined-outer-name
         self.assertEqual(template, 'shoppingcart/receipt.html')
         self.assertEqual(context['order'], self.cart)
         self.assertEqual(context['order'].total_cost, self.testing_cost)
@@ -882,7 +882,7 @@ class ShoppingCartViewsTests(ModuleStoreTestCase):
         self.assertIn('FirstNameTesting123', resp.content)
         self.assertIn('80.00', resp.content)
 
-        ((template, context), _) = render_mock.call_args  # pylint: disable=W0621
+        ((template, context), _) = render_mock.call_args  # pylint: disable=redefined-outer-name
         self.assertEqual(template, 'shoppingcart/receipt.html')
         self.assertEqual(context['order'], self.cart)
         self.assertIn(reg_item, context['shoppingcart_items'][0])
@@ -903,7 +903,7 @@ class ShoppingCartViewsTests(ModuleStoreTestCase):
         resp = self.client.get(reverse('shoppingcart.views.show_receipt', args=[self.cart.id]))
         self.assertEqual(resp.status_code, 200)
 
-        ((template, context), _) = render_mock.call_args  # pylint: disable=W0621
+        ((template, context), _) = render_mock.call_args  # pylint: disable=redefined-outer-name
         self.assertEqual(template, 'shoppingcart/receipt.html')
         self.assertIn(reg_item, context['shoppingcart_items'][0])
         self.assertIn(cert_item, context['shoppingcart_items'][1])
@@ -944,7 +944,7 @@ class ShoppingCartViewsTests(ModuleStoreTestCase):
         # check for the enrollment codes content
         self.assertIn('Please send each professional one of these unique registration codes to enroll into the course.', resp.content)
 
-        ((template, context), _) = render_mock.call_args  # pylint: disable=W0621
+        ((template, context), _) = render_mock.call_args  # pylint: disable=redefined-outer-name
         self.assertEqual(template, 'shoppingcart/receipt.html')
         self.assertEqual(context['order'], self.cart)
         self.assertIn(reg_item, context['shoppingcart_items'][0])

lms/djangoapps/verify_student/migrations/0001_initial.py

@@ -93,4 +93,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['verify_student']
\ No newline at end of file
+    complete_apps = ['verify_student']

lms/djangoapps/verify_student/migrations/0002_auto__add_field_softwaresecurephotoverification_window.py

@@ -85,4 +85,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['verify_student']
\ No newline at end of file
+    complete_apps = ['verify_student']

lms/djangoapps/verify_student/migrations/0003_auto__add_field_softwaresecurephotoverification_display.py

@@ -86,4 +86,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['verify_student']
\ No newline at end of file
+    complete_apps = ['verify_student']