Skip to content

Commit e63ac36

Browse files
OleLaursenOleLaursen
committed
Remove shim layer from ietfauth, delete some dead code and migrate
remaining importers of ietfauth.decorators to ietfauth.utils - Legacy-Id: 6797
1 parent fe5ad0c commit e63ac36

File tree

38 files changed

+87
-453
lines changed

38 files changed

+87
-453
lines changed

‎ietf/dbtemplate/views.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from ietf.dbtemplate.models import DBTemplate
66
from ietf.dbtemplate.forms import DBTemplateForm
77
from ietf.group.models import Group
8-
from ietf.ietfauth.decorators import has_role
8+
from ietf.ietfauth.utils import has_role
99

1010

1111
def template_list(request, acronym):

‎ietf/doc/templatetags/ietf_filters.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ def startswith(x, y):
423423

424424
@register.filter
425425
def has_role(user, role_names):
426-
from ietf.ietfauth.decorators import has_role
426+
from ietf.ietfauth.utils import has_role
427427
if not user:
428428
return False
429429
return has_role(user, role_names.split(','))

‎ietf/doc/views_ballot.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import debug
1717

1818
from ietf.utils.mail import send_mail_text, send_mail_preformatted
19-
from ietf.ietfauth.decorators import has_role, role_required
19+
from ietf.ietfauth.utils import has_role, role_required
2020
from ietf.iesg.models import TelechatDate
2121
from ietf.ipr.models import IprDetail
2222
from ietf.ipr.search import iprs_from_docs

‎ietf/doc/views_conflict_review.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
from ietf.doc.models import save_document_in_history
1414
from ietf.doc.utils import create_ballot_if_not_open, close_open_ballots, get_document_content
15-
from ietf.ietfauth.decorators import has_role, role_required
15+
from ietf.ietfauth.utils import has_role, role_required
1616
from ietf.utils.textupload import get_cleaned_text_file_content
1717
from ietf.utils.mail import send_mail_preformatted
1818
from ietf.doc.mails import email_iana

‎ietf/doc/views_draft.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from django.template.defaultfilters import pluralize
1919

2020
from ietf.utils.mail import send_mail_text, send_mail_message
21-
from ietf.ietfauth.decorators import role_required
21+
from ietf.ietfauth.utils import role_required
2222
from ietf.ietfauth.utils import has_role, is_authorized_in_doc_stream, user_is_person
2323
from ietf.iesg.models import TelechatDate
2424
from ietf.doc.mails import *

‎ietf/doc/views_status_change.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from ietf.doc.models import save_document_in_history
1313

1414
from ietf.doc.utils import create_ballot_if_not_open, close_open_ballots, get_document_content
15-
from ietf.ietfauth.decorators import has_role, role_required
15+
from ietf.ietfauth.utils import has_role, role_required
1616
from ietf.utils.textupload import get_cleaned_text_file_content
1717
from ietf.utils.mail import send_mail_preformatted
1818
from ietf.doc.models import State, Document, DocHistory, DocAlias

‎ietf/group/ajax.py‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1+
import datetime
2+
import logging
3+
import sys
4+
15
from django.utils import simplejson as json
2-
from dajaxice.core import dajaxice_functions
3-
from dajaxice.decorators import dajaxice_register
4-
from ietf.ietfauth.decorators import group_required
56
from django.shortcuts import get_object_or_404
67
from django.http import HttpResponseRedirect, HttpResponse, Http404
78

8-
from ietf.group.models import Group
9-
import datetime
10-
import logging
11-
import sys
12-
from ietf.settings import LOG_DIR
9+
from dajaxice.core import dajaxice_functions
10+
from dajaxice.decorators import dajaxice_register
1311

14-
log = logging.getLogger(__name__)
12+
from ietf.group.models import Group
1513

1614
def group_json(request, groupname):
1715
group = get_object_or_404(Group, acronym=groupname)

‎ietf/ietfauth/__init__.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
# Copyright The IETF Trust 2007, All Rights Reserved
2-

‎ietf/ietfauth/auth.py‎

Lines changed: 0 additions & 115 deletions
This file was deleted.

‎ietf/ietfauth/decorators.py‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)