Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22643 from edx/feanil/2to3_asserts

Browse Source 
Run `2to3 -f asserts . -w` on edx-platform.
This commit is contained in:
Feanil Patel
2019-12-30 12:13:42 -05:00
committed by GitHub
parent 61e1eda20d 39d3a7ca17
commit 2df8b8226b
214 changed files with 1459 additions and 1464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openedx/core/djangoapps/user_api/accounts/tests/test_views.py
View File

@@ -294,7 +294,7 @@ class TestAccountsAPI(CacheIsolationTestCase, UserAPITestCase):
self.assertEqual("world peace", data["goals"])
self.assertTrue(data["is_active"])
self.assertEqual("Park Ave", data['mailing_address'])
self.assertEquals(requires_parental_consent, data["requires_parental_consent"])
self.assertEqual(requires_parental_consent, data["requires_parental_consent"])
self.assertIsNone(data["secondary_email"])
self.assertEqual(year_of_birth, data["year_of_birth"])

6
openedx/core/djangoapps/user_api/management/tests/test_email_opt_in_list.py
View File

@@ -189,7 +189,7 @@ class EmailOptInListTest(ModuleStoreTestCase):
self._set_opt_in_pref(self.user, self.TEST_ORG, True)
# No course available for this particular org
with self.assertRaisesRegexp(CommandError, "^No courses found for orgs:"):
with self.assertRaisesRegex(CommandError, "^No courses found for orgs:"):
self._run_command("other_org")
def test_specify_subset_of_courses(self):
@@ -282,7 +282,7 @@ class EmailOptInListTest(ModuleStoreTestCase):
expected_msg_regex = (
"^Error: the following arguments are required: OUTPUT_FILENAME, ORG_ALIASES$"
)
with self.assertRaisesRegexp(CommandError, expected_msg_regex):
with self.assertRaisesRegex(CommandError, expected_msg_regex):
call_command('email_opt_in_list', *args)
def test_file_already_exists(self):
@@ -291,7 +291,7 @@ class EmailOptInListTest(ModuleStoreTestCase):
def _cleanup():
temp_file.close()
with self.assertRaisesRegexp(CommandError, "^File already exists"):
with self.assertRaisesRegex(CommandError, "^File already exists"):
call_command('email_opt_in_list', temp_file.name, self.TEST_ORG)
def test_no_user_profile(self):

4
openedx/core/djangoapps/user_api/preferences/tests/test_views.py
View File

@@ -237,7 +237,7 @@ class TestPreferencesAPI(UserAPITestCase):
)
self.assertTrue(response.data.get("field_errors", None))
field_errors = response.data["field_errors"]
self.assertEquals(
self.assertEqual(
field_errors,
{
TOO_LONG_PREFERENCE_KEY: {
@@ -519,7 +519,7 @@ class TestPreferencesDetailAPI(UserAPITestCase):
new_value = "new value"
self._set_url(too_long_preference_key)
response = self.send_put(self.client, new_value, expected_status=400)
self.assertEquals(
self.assertEqual(
response.data,
{
"developer_message": get_expected_validation_developer_message(too_long_preference_key, new_value),

6
openedx/core/djangoapps/user_api/tests/test_middleware.py
View File

@@ -42,7 +42,7 @@ class TagsMiddlewareTest(TestCase):
so that the request continues.
"""
# Middleware should pass request through
self.assertEquals(self.middleware.process_request(self.request), None)
self.assertEqual(self.middleware.process_request(self.request), None)
def assertContextSetTo(self, context):
"""Asserts UserTagsEventContextMiddleware.CONTEXT_NAME matches ``context``"""
@@ -114,7 +114,7 @@ class TagsMiddlewareTest(TestCase):
exit_context = get_tracker.return_value.exit_context
# The middleware should clean up the context when the request is done
self.assertEquals(
self.assertEqual(
self.middleware.process_response(self.request, self.response),
self.response
)
@@ -123,7 +123,7 @@ class TagsMiddlewareTest(TestCase):
# Even if the tracker blows up, the middleware should still return the response
get_tracker.side_effect = Exception
self.assertEquals(
self.assertEqual(
self.middleware.process_response(self.request, self.response),
self.response
)

18
openedx/core/djangoapps/user_api/tests/test_models.py
View File

@@ -55,20 +55,20 @@ class UserPreferenceModelTest(ModuleStoreTestCase):
user = UserFactory.create()
course = CourseFactory.create()
tag = UserCourseTagFactory.create(user=user, course_id=course.id, key="testkey", value="foobar")
self.assertEquals(tag.user, user)
self.assertEquals(tag.course_id, course.id)
self.assertEquals(tag.key, "testkey")
self.assertEquals(tag.value, "foobar")
self.assertEqual(tag.user, user)
self.assertEqual(tag.course_id, course.id)
self.assertEqual(tag.key, "testkey")
self.assertEqual(tag.value, "foobar")
def test_create_user_org_tags(self):
"""Create org specific user tags and confirm all properties are set """
user = UserFactory.create()
course = CourseFactory.create()
tag = UserOrgTagFactory.create(user=user, org=course.id.org, key="testkey", value="foobar")
self.assertEquals(tag.user, user)
self.assertEquals(tag.org, course.id.org)
self.assertEquals(tag.key, "testkey")
self.assertEquals(tag.value, "foobar")
self.assertEqual(tag.user, user)
self.assertEqual(tag.org, course.id.org)
self.assertEqual(tag.key, "testkey")
self.assertEqual(tag.value, "foobar")
self.assertIsNotNone(tag.created)
self.assertIsNotNone(tag.modified)
@@ -76,7 +76,7 @@ class UserPreferenceModelTest(ModuleStoreTestCase):
original_modified = tag.modified
tag.value = "barfoo"
tag.save()
self.assertEquals(tag.value, "barfoo")
self.assertEqual(tag.value, "barfoo")
self.assertNotEqual(original_modified, tag.modified)
def test_retire_user_org_tags_by_user_value(self):

4
openedx/core/djangoapps/user_api/tests/test_partition_schemes.py
View File

@@ -98,7 +98,7 @@ class TestRandomUserPartitionScheme(PartitionTestCase):
scheme=RandomUserPartitionScheme
)
# get a group assigned to the user
with self.assertRaisesRegexp(UserPartitionError, "Cannot assign user to an empty user partition"):
with self.assertRaisesRegex(UserPartitionError, "Cannot assign user to an empty user partition"):
RandomUserPartitionScheme.get_group_for_user(self.MOCK_COURSE_ID, self.user, empty_partition)
def test_user_in_deleted_group(self):
@@ -147,5 +147,5 @@ class TestExtension(TestCase):
def test_get_scheme(self):
self.assertEqual(UserPartition.get_scheme('random'), RandomUserPartitionScheme)
with self.assertRaisesRegexp(UserPartitionError, 'Unrecognized scheme'):
with self.assertRaisesRegex(UserPartitionError, 'Unrecognized scheme'):
UserPartition.get_scheme('other')

4
openedx/core/djangoapps/user_api/tests/test_views.py
View File

@@ -611,7 +611,7 @@ class UpdateEmailOptInTestCase(UserAPITestCase, SharedModuleStoreTestCase):
preference = UserOrgTag.objects.get(
user=self.user, org=self.course.id.org, key="email-optin"
)
self.assertEquals(preference.value, result)
self.assertEqual(preference.value, result)
@ddt.data(
(True, False),
@@ -643,7 +643,7 @@ class UpdateEmailOptInTestCase(UserAPITestCase, SharedModuleStoreTestCase):
preference = UserOrgTag.objects.get(
user=self.user, org=self.course.id.org, key="email-optin"
)
self.assertEquals(preference.value, u"True")
self.assertEqual(preference.value, u"True")
def test_update_email_opt_in_anonymous_user(self):
"""