Remove compat wrapper for Django < 1.11

Deleting code is fun. We no longer need to carry these so don't.

Signed-off-by: Stephen Finucane <stephen@that.guru>
Signed-off-by: Daniel Axtens <dja@axtens.net>

diff --git a/patchwork/api/bundle.py b/patchwork/api/bundle.py
index b0005daad9ee8382a8ee4393b61ff4e0e92eefe7..7b147e1d13c285645d9803d72b1f4cc8fa605d79 100644 (file)
--- a/patchwork/api/bundle.py
+++ b/patchwork/api/bundle.py
@@ -28,7 +28,6 @@ from patchwork.api.filters import BundleFilterSet
 from patchwork.api.embedded import PatchSerializer
 from patchwork.api.embedded import ProjectSerializer
 from patchwork.api.embedded import UserSerializer
-from patchwork.compat import is_authenticated
 from patchwork.models import Bundle
 
 
@@ -67,7 +66,7 @@ class BundleMixin(object):
     serializer_class = BundleSerializer
 
     def get_queryset(self):
-        if is_authenticated(self.request.user):
+        if self.request.user.is_authenticated:
             bundle_filter = Q(owner=self.request.user) | Q(public=True)
         else:
             bundle_filter = Q(public=True)

diff --git a/patchwork/compat.py b/patchwork/compat.py
index 3bbff447dbcbe82db9fdf0cc479c96c87f45f70b..8f07bbf31ab41ff14ea9b22cd1d6d7ad5b6db954 100644 (file)
--- a/patchwork/compat.py
+++ b/patchwork/compat.py
@@ -17,30 +17,11 @@
 # along with Patchwork; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-"""Compatibility wrappers for various Django versions."""
+"""Compatibility wrappers for various library versions."""
 
-import django
 from django.conf import settings
 
 
-# DjangoFilterBackend
-#
-# The DjangoFilterBackend was provided in Django REST Framework from 3.0 to
-# 3.4, was marked as pending deprecation in 3.5, was deprecated in 3.6 and will
-# be removed in 3.7. However, the equivalent DjangoFilterBackend found in
-# django-filter is only available since 1.0 of that package.
-#
-# http://www.django-rest-framework.org/topics/3.6-announcement/
-
-if settings.ENABLE_REST_API:
-    import rest_framework  # noqa
-
-    if rest_framework.VERSION >= '3.5':
-        from django_filters.rest_framework import DjangoFilterBackend  # noqa
-    else:
-        from rest_framework.filters import DjangoFilterBackend  # noqa
-
-
 # NAME_FIELD
 #
 # The django-filter library renamed 'Filter.name' to 'Filter.field_name' in
@@ -55,32 +36,3 @@ if settings.ENABLE_REST_API:
         NAME_FIELD = 'field_name'
     else:
         NAME_FIELD = 'name'
-
-
-# reverse, reverse_lazy
-#
-# The reverse and reverse_lazy functions have been moved to django.urls in
-# Django 1.10 and backwards compatible imports will be removed in Django 2.0
-
-if django.VERSION >= (1, 10):
-    from django.urls import NoReverseMatch  # noqa
-    from django.urls import reverse  # noqa
-    from django.urls import reverse_lazy  # noqa
-else:
-    from django.core.urlresolvers import NoReverseMatch  # noqa
-    from django.core.urlresolvers import reverse  # noqa
-    from django.core.urlresolvers import reverse_lazy  # noqa
-
-
-# is_authenticated
-#
-# models.User.is_authenticated is now an attribute in Django 1.10 instead of a
-# function
-#
-# https://docs.djangoproject.com/en/dev/releases/1.10/
-
-def is_authenticated(user):
-    if django.VERSION >= (1, 10):
-        return user.is_authenticated
-    else:
-        return user.is_authenticated()

diff --git a/patchwork/models.py b/patchwork/models.py
index 71a07c944c191a100ffe44240d5f8fd28807eeb0..0409d4bfe32ca4a045ee1cfdc958510ee47a46e1 100644 (file)
--- a/patchwork/models.py
+++ b/patchwork/models.py
@@ -30,11 +30,10 @@ from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
 from django.db import models
+from django.urls import reverse
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.functional import cached_property
 
-from patchwork.compat import is_authenticated
-from patchwork.compat import reverse
 from patchwork.fields import HashField
 from patchwork.hasher import hash_diff
 
@@ -101,7 +100,7 @@ class Project(models.Model):
     use_tags = models.BooleanField(default=True)
 
     def is_editable(self, user):
-        if not is_authenticated(user):
+        if not user.is_authenticated:
             return False
         return self in user.profile.maintainer_projects.all()
 
@@ -481,7 +480,7 @@ class Patch(SeriesMixin, Submission):
         self.refresh_tag_counts()
 
     def is_editable(self, user):
-        if not is_authenticated(user):
+        if not user.is_authenticated:
             return False
 
         if user in [self.submitter.user, self.delegate]:

diff --git a/patchwork/paginator.py b/patchwork/paginator.py
index 359ec86793b7f0bfa43845987e0c143e0b8a49b1..f565c420510c9029908f3ec44241ed34840fce22 100644 (file)
--- a/patchwork/paginator.py
+++ b/patchwork/paginator.py
@@ -22,8 +22,6 @@ from __future__ import absolute_import
 from django.conf import settings
 from django.core import paginator
 
-from patchwork.compat import is_authenticated
-
 
 DEFAULT_ITEMS_PER_PAGE = 100
 LONG_PAGE_THRESHOLD = 30
@@ -44,7 +42,7 @@ class Paginator(paginator.Paginator):
 
         items_per_page = settings.DEFAULT_ITEMS_PER_PAGE
 
-        if is_authenticated(request.user):
+        if request.user.is_authenticated:
             items_per_page = request.user.profile.items_per_page
 
         super(Paginator, self).__init__(objects, items_per_page)

diff --git a/patchwork/settings/base.py b/patchwork/settings/base.py
index f96f3694b4f219091b769d95bec35205c074beb9..99eb3c060cc9001e89b4b506da5f9e2e2ecf3680 100644 (file)
--- a/patchwork/settings/base.py
+++ b/patchwork/settings/base.py
@@ -128,7 +128,7 @@ REST_FRAMEWORK = {
         'rest_framework.versioning.URLPathVersioning',
     'DEFAULT_PAGINATION_CLASS': 'patchwork.api.base.LinkHeaderPagination',
     'DEFAULT_FILTER_BACKENDS': (
-        'patchwork.compat.DjangoFilterBackend',
+        'django_filters.rest_framework.DjangoFilterBackend',
         'rest_framework.filters.SearchFilter',
         'rest_framework.filters.OrderingFilter',
     ),

diff --git a/patchwork/templatetags/listurl.py b/patchwork/templatetags/listurl.py
index 6b9106e9cd2429705f68547066d04d199d860c53..76dae7973fd6bd7f41882b4ed6d9dd3b4c4b1f7e 100644 (file)
--- a/patchwork/templatetags/listurl.py
+++ b/patchwork/templatetags/listurl.py
@@ -21,11 +21,11 @@ from __future__ import absolute_import
 
 from django.conf import settings
 from django import template
+from django.urls import reverse
+from django.urls import NoReverseMatch
 from django.utils.encoding import smart_str
 from django.utils.html import escape
 
-from patchwork.compat import reverse
-from patchwork.compat import NoReverseMatch
 from patchwork.filters import filterclasses
 
 

diff --git a/patchwork/templatetags/person.py b/patchwork/templatetags/person.py
index a6f23e917fc8ed0d78ba04813d44ff18c84d3d3c..09c8d1033fa18414c1d58ef330c4fca48efaf82d 100644 (file)
--- a/patchwork/templatetags/person.py
+++ b/patchwork/templatetags/person.py
@@ -20,10 +20,10 @@
 from __future__ import absolute_import
 
 from django import template
+from django.urls import reverse
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 
-from patchwork.compat import reverse
 from patchwork.filters import SubmitterFilter
 
 

diff --git a/patchwork/tests/api/test_bundle.py b/patchwork/tests/api/test_bundle.py
index 7c48d344fb46d33ccbe859ae3aa60ca31402ae84..e0dd8098d7a1cc448dd4f6761935be3bcbc66395 100644 (file)
--- a/patchwork/tests/api/test_bundle.py
+++ b/patchwork/tests/api/test_bundle.py
@@ -20,8 +20,8 @@
 import unittest
 
 from django.conf import settings
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.tests.utils import create_bundle
 from patchwork.tests.utils import create_maintainer
 from patchwork.tests.utils import create_project

diff --git a/patchwork/tests/api/test_check.py b/patchwork/tests/api/test_check.py
index 0e7e0cfc3dd3c43e24631810c0fe2f9a6281191f..6f4aa5dedd92f84c9ccdea29ee3256002856f242 100644 (file)
--- a/patchwork/tests/api/test_check.py
+++ b/patchwork/tests/api/test_check.py
@@ -20,8 +20,8 @@
 import unittest
 
 from django.conf import settings
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.models import Check
 from patchwork.tests.utils import create_check
 from patchwork.tests.utils import create_patch

diff --git a/patchwork/tests/api/test_comment.py b/patchwork/tests/api/test_comment.py
index f79ea4695fe75ced4c88dea94f0edffd2c636cfa..f82c881add6f0182f45ff833999814dff6d46fe3 100644 (file)
--- a/patchwork/tests/api/test_comment.py
+++ b/patchwork/tests/api/test_comment.py
@@ -20,9 +20,9 @@
 import unittest
 
 from django.conf import settings
+from django.urls import NoReverseMatch
+from django.urls import reverse
 
-from patchwork.compat import NoReverseMatch
-from patchwork.compat import reverse
 from patchwork.tests.utils import create_comment
 from patchwork.tests.utils import create_cover
 from patchwork.tests.utils import create_patch

diff --git a/patchwork/tests/api/test_cover.py b/patchwork/tests/api/test_cover.py
index e4d814e48e8928cd3434cd9ab02317d05d19f6d7..5061d651eb31af86109ec48208349a8ae604df20 100644 (file)
--- a/patchwork/tests/api/test_cover.py
+++ b/patchwork/tests/api/test_cover.py
@@ -21,8 +21,8 @@ import email.parser
 import unittest
 
 from django.conf import settings
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.tests.utils import create_cover
 from patchwork.tests.utils import create_maintainer
 from patchwork.tests.utils import create_person

diff --git a/patchwork/tests/api/test_patch.py b/patchwork/tests/api/test_patch.py
index 27b9924845362a4a3a940edaafa286b257894a22..104f7c8ac672ecc67e38b2823147f5b0a2ddbedb 100644 (file)
--- a/patchwork/tests/api/test_patch.py
+++ b/patchwork/tests/api/test_patch.py
@@ -22,8 +22,8 @@ from email.utils import make_msgid
 import unittest
 
 from django.conf import settings
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.models import Patch
 from patchwork.tests.utils import create_maintainer
 from patchwork.tests.utils import create_patch

diff --git a/patchwork/tests/api/test_person.py b/patchwork/tests/api/test_person.py
index 22b12813e4c00f6baaccc7f4ca5b68d35382c9ab..688a00e9029258b497a121ced5fb5939cab41f74 100644 (file)
--- a/patchwork/tests/api/test_person.py
+++ b/patchwork/tests/api/test_person.py
@@ -20,8 +20,8 @@
 import unittest
 
 from django.conf import settings
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.tests.utils import create_maintainer
 from patchwork.tests.utils import create_person
 from patchwork.tests.utils import create_user

diff --git a/patchwork/tests/api/test_project.py b/patchwork/tests/api/test_project.py
index 129cedb7493fccda46caa6a77f90990e8e196bcb..6c5c9c6df3eae1d918087883fc1556dff3bb7723 100644 (file)
--- a/patchwork/tests/api/test_project.py
+++ b/patchwork/tests/api/test_project.py
@@ -20,8 +20,8 @@
 import unittest
 
 from django.conf import settings
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.models import Project
 from patchwork.tests.utils import create_maintainer
 from patchwork.tests.utils import create_project

diff --git a/patchwork/tests/api/test_series.py b/patchwork/tests/api/test_series.py
index 11324bc3fd8e065440555a1502509780c32fc589..138725757c10bdf7018e694868cb677c45d8892e 100644 (file)
--- a/patchwork/tests/api/test_series.py
+++ b/patchwork/tests/api/test_series.py
@@ -20,8 +20,8 @@
 import unittest
 
 from django.conf import settings
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.tests.utils import create_cover
 from patchwork.tests.utils import create_maintainer
 from patchwork.tests.utils import create_project

diff --git a/patchwork/tests/api/test_user.py b/patchwork/tests/api/test_user.py
index 873312dfee44745208e413820aa4903a956ac4ce..4b4171eab2379f8d458a676e481ac87da351e44e 100644 (file)
--- a/patchwork/tests/api/test_user.py
+++ b/patchwork/tests/api/test_user.py
@@ -20,8 +20,8 @@
 import unittest
 
 from django.conf import settings
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.tests.utils import create_maintainer
 from patchwork.tests.utils import create_user
 

diff --git a/patchwork/tests/test_about.py b/patchwork/tests/test_about.py
index f40596827bc2e15a59220e36221e7d26b34bb4ad..956d0324aaef0d3914f902d01fb1c43d588b64cf 100644 (file)
--- a/patchwork/tests/test_about.py
+++ b/patchwork/tests/test_about.py
@@ -18,8 +18,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from django.test import TestCase
-
-from patchwork.compat import reverse
+from django.urls import reverse
 
 
 class AboutViewTest(TestCase):

diff --git a/patchwork/tests/test_bundles.py b/patchwork/tests/test_bundles.py
index 4461e32fc930c58ebb0b513530a37986cb0e3f29..3fa556b0103f6ebf1d812e204a7ad43775557d9e 100644 (file)
--- a/patchwork/tests/test_bundles.py
+++ b/patchwork/tests/test_bundles.py
@@ -25,12 +25,12 @@ import unittest
 
 from django.conf import settings
 from django.test import TestCase
+from django.urls import reverse
 from django.utils.http import urlencode
 from django.utils import six
 from django.utils.six.moves import range
 from django.utils.six.moves import zip
 
-from patchwork.compat import reverse
 from patchwork.models import Bundle
 from patchwork.models import BundlePatch
 from patchwork.tests.utils import create_bundle

diff --git a/patchwork/tests/test_completion.py b/patchwork/tests/test_completion.py
index 8297e57130b3fd81ae63bb0e69cd2f2c3d3e87fd..8e769d4bbc8598188a75c872d3cd0b213897fae7 100644 (file)
--- a/patchwork/tests/test_completion.py
+++ b/patchwork/tests/test_completion.py
@@ -22,9 +22,9 @@ from __future__ import absolute_import
 import json
 
 from django.test import TestCase
+from django.urls import reverse
 from django.utils.six.moves import range
 
-from patchwork.compat import reverse
 from patchwork.tests.utils import create_person
 
 

diff --git a/patchwork/tests/test_confirm.py b/patchwork/tests/test_confirm.py
index ed264313c4340dac337a44c448680b5fa238e736..7d805300a1b990d30cd1f5bf5c9862056f1e9677 100644 (file)
--- a/patchwork/tests/test_confirm.py
+++ b/patchwork/tests/test_confirm.py
@@ -18,8 +18,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from django.test import TestCase
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.models import EmailConfirmation
 from patchwork.tests.utils import create_user
 

diff --git a/patchwork/tests/test_detail.py b/patchwork/tests/test_detail.py
index 5d8534eae17b7ae67267bd16fd8ca406be1471b4..f119da057458314a5bc6f5006748746db45d7c5d 100644 (file)
--- a/patchwork/tests/test_detail.py
+++ b/patchwork/tests/test_detail.py
@@ -20,8 +20,8 @@
 from __future__ import absolute_import
 
 from django.test import TestCase
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.tests.utils import create_comment
 from patchwork.tests.utils import create_cover
 from patchwork.tests.utils import create_patch

diff --git a/patchwork/tests/test_encodings.py b/patchwork/tests/test_encodings.py
index 794d67aced23326a1b83d9b7bfe60fa948c99643..5a56d4b15cc3d4d23df6013af9bdc50d25ac8251 100644 (file)
--- a/patchwork/tests/test_encodings.py
+++ b/patchwork/tests/test_encodings.py
@@ -18,8 +18,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from django.test import TestCase
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.tests.utils import create_person
 from patchwork.tests.utils import create_patch
 from patchwork.tests.utils import read_patch

diff --git a/patchwork/tests/test_filters.py b/patchwork/tests/test_filters.py
index 23cf0ff094e6fb996a8f495fbe167f508b21b0d6..44180f90b5a9c3da5833f886788f46018d3754fe 100644 (file)
--- a/patchwork/tests/test_filters.py
+++ b/patchwork/tests/test_filters.py
@@ -18,8 +18,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from django.test import TestCase
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.tests.utils import create_project
 
 

diff --git a/patchwork/tests/test_list.py b/patchwork/tests/test_list.py
index 2a023ac6d7f1d22290ec0edb2acba23ee7138abc..867d77f6210897be1d9debdcb08566610ef2bbdd 100644 (file)
--- a/patchwork/tests/test_list.py
+++ b/patchwork/tests/test_list.py
@@ -23,9 +23,9 @@ from datetime import datetime as dt
 import re
 
 from django.test import TestCase
+from django.urls import reverse
 from django.utils.six.moves import zip
 
-from patchwork.compat import reverse
 from patchwork.models import Patch
 from patchwork.tests.utils import create_patch
 from patchwork.tests.utils import create_person

diff --git a/patchwork/tests/test_mail_settings.py b/patchwork/tests/test_mail_settings.py
index d38149d86425f6aebc3bf930d81431d49538c50b..a6f496459dc19dbb87081200a0aba8a6e657588b 100644 (file)
--- a/patchwork/tests/test_mail_settings.py
+++ b/patchwork/tests/test_mail_settings.py
@@ -21,8 +21,8 @@ import re
 
 from django.core import mail
 from django.test import TestCase
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.models import EmailOptout
 from patchwork.models import EmailConfirmation
 from patchwork.tests.utils import create_person

diff --git a/patchwork/tests/test_mboxviews.py b/patchwork/tests/test_mboxviews.py
index 8eb3581adafe732e97632d370dd91c95c04f47b2..b7af746bf63531f1813de772c1e8233c2ac7e2b9 100644 (file)
--- a/patchwork/tests/test_mboxviews.py
+++ b/patchwork/tests/test_mboxviews.py
@@ -25,8 +25,8 @@ import dateutil.tz
 import email
 
 from django.test import TestCase
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.tests.utils import create_comment
 from patchwork.tests.utils import create_patch
 from patchwork.tests.utils import create_project

diff --git a/patchwork/tests/test_paginator.py b/patchwork/tests/test_paginator.py
index b2191bbb92d11fe38c92132060b89374f86396b5..2f2b6e1391a0b9c60db4b47cf8d5bd434872510b 100644 (file)
--- a/patchwork/tests/test_paginator.py
+++ b/patchwork/tests/test_paginator.py
@@ -18,8 +18,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from django.test import TestCase
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.tests.utils import create_patches
 from patchwork.tests.utils import create_project
 from patchwork.tests.utils import create_user

diff --git a/patchwork/tests/test_projects.py b/patchwork/tests/test_projects.py
index 804bdda280314c2d1dd36f13e0a69971d88bb519..67ac125015a9c733e1e185cbc3a86b094364671b 100644 (file)
--- a/patchwork/tests/test_projects.py
+++ b/patchwork/tests/test_projects.py
@@ -18,8 +18,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from django.test import TestCase
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.tests import utils
 
 

diff --git a/patchwork/tests/test_registration.py b/patchwork/tests/test_registration.py
index 28581eb5c1fcccba67b03ddd2bed2c7693e08dbc..2158dcf5a99ecf2a1765200576d399404d24dbb5 100644 (file)
--- a/patchwork/tests/test_registration.py
+++ b/patchwork/tests/test_registration.py
@@ -21,8 +21,8 @@ from django.contrib.auth.models import User
 from django.core import mail
 from django.test.client import Client
 from django.test import TestCase
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.models import EmailConfirmation, Person
 from patchwork.tests.utils import create_user
 

diff --git a/patchwork/tests/test_updates.py b/patchwork/tests/test_updates.py
index 80367f454f6032f3c6752a81f59edbc6362358a5..89f2091a3888805f8c62597ecf8f8284a5487176 100644 (file)
--- a/patchwork/tests/test_updates.py
+++ b/patchwork/tests/test_updates.py
@@ -18,8 +18,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from django.test import TestCase
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.models import Patch
 from patchwork.models import State
 from patchwork.tests.utils import create_patches

diff --git a/patchwork/tests/test_user.py b/patchwork/tests/test_user.py
index 6dd41e1f00e7d39feb0e51984bb3bd4b71993450..05fe6d5e2c70bec20ea2cae7e5ebe21b93b3e86e 100644 (file)
--- a/patchwork/tests/test_user.py
+++ b/patchwork/tests/test_user.py
@@ -20,8 +20,8 @@
 from django.contrib.auth.models import User
 from django.core import mail
 from django.test import TestCase
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.models import EmailConfirmation
 from patchwork.models import Person
 from patchwork.models import UserProfile

diff --git a/patchwork/tests/test_xmlrpc.py b/patchwork/tests/test_xmlrpc.py
index 8edc07ac4bcb7d68b20927c33a841d1c19eb4a34..a31cdde07136e3726624b0543ab3d2a1a9b79c59 100644 (file)
--- a/patchwork/tests/test_xmlrpc.py
+++ b/patchwork/tests/test_xmlrpc.py
@@ -21,9 +21,9 @@ import unittest
 
 from django.conf import settings
 from django.test import LiveServerTestCase
+from django.urls import reverse
 from django.utils.six.moves import xmlrpc_client
 
-from patchwork.compat import reverse
 from patchwork.tests import utils
 
 

diff --git a/patchwork/urls.py b/patchwork/urls.py
index e90de6b2c6ef981d5ff675c917e2d8a217d62f0b..6b1ef511ef15408f6037304a2e1020f2b1835e9f 100644 (file)
--- a/patchwork/urls.py
+++ b/patchwork/urls.py
@@ -22,8 +22,8 @@ from django.conf import settings
 from django.conf.urls import url, include
 from django.contrib import admin
 from django.contrib.auth import views as auth_views
+from django.urls import reverse_lazy
 
-from patchwork.compat import reverse_lazy
 from patchwork.views import about as about_views
 from patchwork.views import api as api_views
 from patchwork.views import bundle as bundle_views

diff --git a/patchwork/views/__init__.py b/patchwork/views/__init__.py
index f8d23a388ac7d8ca584d23dfebbf36d49145ad54..a30b3a61cfb7db844207a60b91f80a713dabbeb8 100644 (file)
--- a/patchwork/views/__init__.py
+++ b/patchwork/views/__init__.py
@@ -20,7 +20,6 @@
 from django.contrib import messages
 from django.shortcuts import get_object_or_404
 
-from patchwork.compat import is_authenticated
 from patchwork.filters import Filters
 from patchwork.forms import MultiplePatchForm
 from patchwork.models import Bundle
@@ -230,7 +229,7 @@ def generic_list(request, project, view, view_args=None, filter_settings=None,
     user = request.user
     properties_form = None
 
-    if is_authenticated(user):
+    if user.is_authenticated:
         # we only pass the post data to the MultiplePatchForm if that was
         # the actual form submitted
         data_tmp = None

diff --git a/patchwork/views/about.py b/patchwork/views/about.py
index 24a0845e200236a214c18b42fc5c6a9ea2b7baf5..508dec3796e9d74c26347a72f0369159619da7b8 100644 (file)
--- a/patchwork/views/about.py
+++ b/patchwork/views/about.py
@@ -21,8 +21,7 @@
 from django.conf import settings
 from django.http import HttpResponsePermanentRedirect
 from django.shortcuts import render
-
-from patchwork.compat import reverse
+from django.urls import reverse
 
 
 def about(request):

diff --git a/patchwork/views/bundle.py b/patchwork/views/bundle.py
index 5aa63fba170530e89f480392674bb3af95329468..714062c34475e8744da42a35d6c89066e3bc9ac2 100644 (file)
--- a/patchwork/views/bundle.py
+++ b/patchwork/views/bundle.py
@@ -24,8 +24,8 @@ from django.http import HttpResponseRedirect
 from django.http import HttpResponseNotFound
 from django.shortcuts import get_object_or_404
 from django.shortcuts import render
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.filters import DelegateFilter
 from patchwork.forms import BundleForm
 from patchwork.forms import DeleteBundleForm

diff --git a/patchwork/views/comment.py b/patchwork/views/comment.py
index 987f76c50b2470f3107147f594ef917197572df9..c97632274468d446a41e608249aba9bf1d6aa2aa 100644 (file)
--- a/patchwork/views/comment.py
+++ b/patchwork/views/comment.py
@@ -19,8 +19,8 @@
 
 from django import http
 from django import shortcuts
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork import models
 
 

diff --git a/patchwork/views/cover.py b/patchwork/views/cover.py
index 73f83cb99b995d2b46bf6ca91b3437b6306eac26..f18a262fb988f1c04d5f7f1460888ef73d89e151 100644 (file)
--- a/patchwork/views/cover.py
+++ b/patchwork/views/cover.py
@@ -22,8 +22,8 @@ from django.http import HttpResponse
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 from django.shortcuts import render_to_response
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.models import CoverLetter
 from patchwork.models import Submission
 from patchwork.views.utils import cover_to_mbox

diff --git a/patchwork/views/mail.py b/patchwork/views/mail.py
index 8afd83b3d7be7125e2b02ebdeec393b523deca1f..aca7ab15ea29edb905eb486571f4e9beb6a45292 100644 (file)
--- a/patchwork/views/mail.py
+++ b/patchwork/views/mail.py
@@ -24,8 +24,8 @@ from django.core.mail import send_mail
 from django.http import HttpResponseRedirect
 from django.shortcuts import render
 from django.template.loader import render_to_string
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.forms import EmailForm
 from patchwork.models import EmailConfirmation
 from patchwork.models import EmailOptout

diff --git a/patchwork/views/patch.py b/patchwork/views/patch.py
index cbd4ec395d9963d9fc30dc7e687ec848e5bd4ca0..6921882e71d11ea664c01d0255f6d479e4635b8c 100644 (file)
--- a/patchwork/views/patch.py
+++ b/patchwork/views/patch.py
@@ -24,9 +24,8 @@ from django.http import HttpResponseForbidden
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 from django.shortcuts import render
+from django.urls import reverse
 
-from patchwork.compat import reverse
-from patchwork.compat import is_authenticated
 from patchwork.forms import CreateBundleForm
 from patchwork.forms import PatchForm
 from patchwork.models import Bundle
@@ -43,7 +42,7 @@ def patch_list(request, project_id):
     context = generic_list(request, project, 'patch-list',
                            view_args={'project_id': project.linkname})
 
-    if is_authenticated(request.user):
+    if request.user.is_authenticated:
         context['bundles'] = request.user.bundles.all()
 
     return render(request, 'patchwork/list.html', context)
@@ -70,7 +69,7 @@ def patch_detail(request, patch_id):
 
     if editable:
         form = PatchForm(instance=patch)
-    if is_authenticated(request.user):
+    if request.user.is_authenticated:
         createbundleform = CreateBundleForm()
 
     if request.method == 'POST':
@@ -111,7 +110,7 @@ def patch_detail(request, patch_id):
                 form.save()
                 messages.success(request, 'Patch updated')
 
-    if is_authenticated(request.user):
+    if request.user.is_authenticated:
         context['bundles'] = request.user.bundles.all()
 
     context['submission'] = patch

diff --git a/patchwork/views/project.py b/patchwork/views/project.py
index 484455c02d9da46139503a358a06a5315ee2f74e..a2e5b2da85b01349080f8eef4b00bb6a171dfce5 100644 (file)
--- a/patchwork/views/project.py
+++ b/patchwork/views/project.py
@@ -22,8 +22,8 @@ from django.contrib.auth.models import User
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 from django.shortcuts import render
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.models import Patch
 from patchwork.models import Project
 

diff --git a/patchwork/views/user.py b/patchwork/views/user.py
index 4a4958ab170a854640c4ad2bc01938f9bf9c7062..8dcb407b59661337a6cd340f77e7e37452488d6e 100644 (file)
--- a/patchwork/views/user.py
+++ b/patchwork/views/user.py
@@ -28,8 +28,8 @@ from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 from django.shortcuts import render
 from django.template.loader import render_to_string
+from django.urls import reverse
 
-from patchwork.compat import reverse
 from patchwork.filters import DelegateFilter
 from patchwork.forms import EmailForm
 from patchwork.forms import RegistrationForm

diff --git a/patchwork/views/xmlrpc.py b/patchwork/views/xmlrpc.py
index 93f6035eb164e368de6a634760a9e84d80cc8fcb..b02a65b6fecde9faad889fc5988ca003d821108a 100644 (file)
--- a/patchwork/views/xmlrpc.py
+++ b/patchwork/views/xmlrpc.py
@@ -35,11 +35,11 @@ from django.http import HttpResponse
 from django.http import HttpResponseRedirect
 from django.http import HttpResponseServerError
 from django.views.decorators.csrf import csrf_exempt
+from django.urls import reverse
 from django.utils import six
 from django.utils.six.moves import xmlrpc_client
 from django.utils.six.moves.xmlrpc_server import SimpleXMLRPCDispatcher
 
-from patchwork.compat import reverse
 from patchwork.models import Check
 from patchwork.models import Patch
 from patchwork.models import Person