Skip to content

Commit d2c2d80

Browse files
committed
Merged in [13112] from lars@netapp.com:
Fix various \'RemovedInDjango20Warning\' warnings. - Legacy-Id: 13141 Note: SVN reference [13112] has been migrated to Git commit 8a70e97
2 parents 6aee4d4 + 8a70e97 commit d2c2d80

110 files changed

Lines changed: 138 additions & 138 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ietf/api/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from django.conf import settings
77
from django.http import HttpResponse
88
from django.core.exceptions import ObjectDoesNotExist
9-
from django.core.urlresolvers import reverse
9+
from django.urls import reverse
1010
from django.utils.encoding import force_text
1111

1212
import debug # pyflakes:ignore

ietf/community/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from django.contrib.auth.models import User
22
from django.db import models
33
from django.db.models import signals
4-
from django.core.urlresolvers import reverse as urlreverse
4+
from django.urls import reverse as urlreverse
55

66
from ietf.doc.models import Document, DocEvent, State
77
from ietf.group.models import Group

ietf/community/tests.py

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

33
from pyquery import PyQuery
44

5-
from django.core.urlresolvers import reverse as urlreverse
5+
from django.urls import reverse as urlreverse
66
from django.contrib.auth.models import User
77

88
from ietf.community.models import CommunityList, SearchRule, EmailSubscription

ietf/community/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def lookup_community_list(username=None, acronym=None):
3636
return clist
3737

3838
def can_manage_community_list(user, clist):
39-
if not user or not user.is_authenticated():
39+
if not user or not user.is_authenticated:
4040
return False
4141

4242
if clist.user:
@@ -60,7 +60,7 @@ def augment_docs_with_tracking_info(docs, user):
6060

6161
tracked = set()
6262

63-
if user and user.is_authenticated():
63+
if user and user.is_authenticated:
6464
clist = CommunityList.objects.filter(user=user).first()
6565
if clist:
6666
tracked.update(docs_tracked_by_community_list(clist).filter(pk__in=docs).values_list("pk", flat=True))

ietf/community/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def view_list(request, username=None):
2222
docs = docs_tracked_by_community_list(clist)
2323
docs, meta = prepare_document_table(request, docs, request.GET)
2424

25-
subscribed = request.user.is_authenticated() and EmailSubscription.objects.filter(community_list=clist, email__person__user=request.user)
25+
subscribed = request.user.is_authenticated and EmailSubscription.objects.filter(community_list=clist, email__person__user=request.user)
2626

2727
return render(request, 'community/view_list.html', {
2828
'clist': clist,

ietf/cookies/tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from pyquery import PyQuery
22
from Cookie import SimpleCookie
33

4-
from django.core.urlresolvers import reverse as urlreverse
4+
from django.urls import reverse as urlreverse
55

66
import debug # pyflakes:ignore
77

ietf/doc/feeds.py

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

55
from django.contrib.syndication.views import Feed, FeedDoesNotExist
66
from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed
7-
from django.core.urlresolvers import reverse as urlreverse
7+
from django.urls import reverse as urlreverse
88
from django.template.defaultfilters import truncatewords, truncatewords_html, date as datefilter, linebreaks
99
from django.utils.html import strip_tags
1010

ietf/doc/fields.py

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

33
from django.utils.html import escape
44
from django import forms
5-
from django.core.urlresolvers import reverse as urlreverse
5+
from django.urls import reverse as urlreverse
66

77
import debug # pyflakes:ignore
88

ietf/doc/mails.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from django.template.loader import render_to_string
77
from django.utils.html import strip_tags
88
from django.conf import settings
9-
from django.core.urlresolvers import reverse as urlreverse
9+
from django.urls import reverse as urlreverse
1010

1111
from ietf.utils.mail import send_mail, send_mail_text
1212
from ietf.ipr.utils import iprs_from_docs, related_docs

ietf/doc/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from django.db import models
88
from django.core import checks
99
from django.core.exceptions import ValidationError
10-
from django.core.urlresolvers import reverse as urlreverse
10+
from django.urls import reverse as urlreverse
1111
from django.core.validators import URLValidator
1212
from django.contrib.contenttypes.models import ContentType
1313
from django.conf import settings

0 commit comments

Comments
 (0)