From 45e5cbb5999eac55a7919f96a3ae9c91c6854f56 Mon Sep 17 00:00:00 2001 From: Jawayria Date: Tue, 2 Feb 2021 14:52:21 +0500 Subject: [PATCH] Applied pylint-amnesty to student --- common/djangoapps/student/management/commands/add_to_group.py | 4 ++++ common/djangoapps/student/tasks.py | 3 +++ 2 files changed, 7 insertions(+) diff --git a/common/djangoapps/student/management/commands/add_to_group.py b/common/djangoapps/student/management/commands/add_to_group.py index 7381a22993..163e89c671 100644 --- a/common/djangoapps/student/management/commands/add_to_group.py +++ b/common/djangoapps/student/management/commands/add_to_group.py @@ -1,4 +1,8 @@ +<<<<<<< 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 diff --git a/common/djangoapps/student/tasks.py b/common/djangoapps/student/tasks.py index e580a181a6..6653508586 100644 --- a/common/djangoapps/student/tasks.py +++ b/common/djangoapps/student/tasks.py @@ -71,6 +71,7 @@ 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' @@ -83,3 +84,5 @@ _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