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

resolved errors

Browse Source
This commit is contained in:
Jawayria
2021-02-03 15:47:18 +05:00
parent 45e5cbb599
commit 633b9f7060
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/djangoapps/student/management/commands/add_to_group.py
View File

@@ -1,8 +1,4 @@
<<<<<<< HEAD
# lint-amnesty, pylint: disable=missing-module-docstring
=======
# lint-amnesty, pylint: disable=missing-module-docstring
>>>>>>> Applied pylint-amnesty to student
from django.contrib.auth.models import Group, User # lint-amnesty, pylint: disable=imported-auth-user
from django.core.management.base import BaseCommand, CommandError

3
common/djangoapps/student/tasks.py
View File

@@ -71,7 +71,6 @@ def _send_activation_email(self, msg_string, from_address=None):
dest_addr,
)
raise Exception # lint-amnesty, pylint: disable=raise-missing-from
<<<<<<< HEAD
_OLD_TASK_NAME = 'student.send_activation_email'
@@ -84,5 +83,3 @@ _NEW_TASK_NAME = 'common.djangoapps.student.tasks.send_activation_email'
# set `send_activation_email` to the new-named task.
send_activation_email = shared_task(bind=True, name=_OLD_TASK_NAME)(_send_activation_email)
shared_task(bind=True, name=_NEW_TASK_NAME)(_send_activation_email)
=======
>>>>>>> Applied pylint-amnesty to student