Fix deprecation warnings

cfgov/agreements/tests/test_legacy.py

@@ -3,18 +3,13 @@
 from django.core.paginator import Page
 from django.http import HttpResponse
 from django.test import TestCase
+from django.urls import reverse
 
 from mock import patch
 
 from agreements import models
 
 
-try:
-    from django.urls import reverse
-except ImportError:
-    from django.core.urlresolvers import reverse
-
-
 def agreement_factory(**kwargs):
     """
     Create an agreement with some defaults.

cfgov/agreements/tests/test_views.py

@@ -1,16 +1,11 @@
 from django.http import Http404
 from django.test import RequestFactory, TestCase
+from django.urls import reverse
 
 from agreements.models import Agreement, Issuer
 from agreements.views import issuer_search
 
 
-try:
-    from django.urls import reverse
-except ImportError:
-    from django.core.urlresolvers import reverse
-
-
 class TestIssuerSearch(TestCase):
     def setUp(self):
         self.request = RequestFactory().get("/")

cfgov/agreements/urls.py

@@ -1,14 +1,11 @@
-from agreements.views import index, issuer_search
-
+from django.urls import re_path
 
-try:
-    from django.urls import re_path
-except ImportError:
-    from django.conf.urls import url as re_path
+from agreements.views import index, issuer_search
 
 
 urlpatterns = [
-    re_path(r'^$', index, name='agreements_home'),
-    re_path(r'^issuer/(?P<issuer_slug>.*)/$', issuer_search,
-            name='issuer_search'),
+    re_path(r"^$", index, name="agreements_home"),
+    re_path(
+        r"^issuer/(?P<issuer_slug>.*)/$", issuer_search, name="issuer_search"
+    ),
 ]

cfgov/ask_cfpb/models/django.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-import html.parser as HTMLParser
-
 from django.contrib.auth.models import User
 from django.db import models
 
@@ -9,8 +7,6 @@
 from wagtail.images.edit_handlers import ImageChooserPanel
 
 
-html_parser = HTMLParser.HTMLParser()
-
 ENGLISH_PARENT_SLUG = 'ask-cfpb'
 SPANISH_PARENT_SLUG = 'obtener-respuestas'
 

cfgov/ask_cfpb/scripts/export_ask_data.py

@@ -1,16 +1,14 @@
 import datetime
-import html.parser as HTMLParser
+import html
 
 from django.http import HttpResponse
-from django.utils import html
+from django.utils import html as html_util
 
 import unicodecsv
 
 from ask_cfpb.models.pages import AnswerPage
 
 
-html_parser = HTMLParser.HTMLParser()
-
 HEADINGS = [
     'ASK_ID',
     'PAGE_ID',
@@ -29,8 +27,8 @@
 
 
 def clean_and_strip(data):
-    unescaped = html_parser.unescape(data)
-    return html.strip_tags(unescaped).strip()
+    unescaped = html.unescape(data)
+    return html_util.strip_tags(unescaped).strip()
 
 
 def assemble_output():

cfgov/ask_cfpb/tests/models/test_pages.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 import datetime
-from html.parser import HTMLParser
 from unittest import mock
 
 from django.apps import apps
 from django.contrib.auth.models import User
 from django.core.paginator import Paginator
 from django.http import HttpRequest, HttpResponse
 from django.test import TestCase, override_settings
+from django.urls import reverse
 from django.utils import timezone, translation
 from haystack.models import SearchResult
 from haystack.query import SearchQuerySet
@@ -38,13 +38,6 @@
 )
 
 
-try:
-    from django.urls import reverse
-except ImportError:
-    from django.core.urlresolvers import reverse
-
-
-html_parser = HTMLParser()
 now = timezone.now()
 
 

cfgov/ask_cfpb/tests/test_views.py

@@ -4,6 +4,7 @@
 from django.apps import apps
 from django.http import Http404, HttpRequest, QueryDict
 from django.test import TestCase, override_settings
+from django.urls import NoReverseMatch, reverse
 from django.utils import timezone
 
 from wagtail.core.models import Site
@@ -21,12 +22,6 @@
 from v1.util.migrations import get_or_create_page
 
 
-try:
-    from django.urls import NoReverseMatch, reverse
-except ImportError:
-    from django.core.urlresolvers import NoReverseMatch, reverse
-
-
 now = timezone.now()
 
 

cfgov/ask_cfpb/wagtail_hooks.py

@@ -1,5 +1,6 @@
 from django.conf import settings
 from django.shortcuts import render
+from django.urls import re_path, reverse
 from django.utils.html import format_html
 
 from wagtail.admin.menu import MenuItem
@@ -10,13 +11,6 @@
 from ask_cfpb.scripts import export_ask_data
 
 
-try:
-    from django.urls import re_path, reverse
-except ImportError:
-    from django.conf.urls import url as re_path
-    from django.core.urlresolvers import reverse
-
-
 def export_data(request):
     if request.method == 'POST':
         return export_ask_data.export_questions(http_response=True)
@@ -35,7 +29,7 @@ def editor_css():
 def register_export_menu_item():
     return MenuItem(
         'Export Ask data',
-        reverse('export-ask'),
+        reverse("export-ask"),
         classnames='icon icon-download',
         order=99999,
     )

cfgov/cfgov/tests/test_urls.py

@@ -1,4 +1,4 @@
-from imp import reload
+from importlib import reload
 
 import django
 from django.test import RequestFactory, TestCase, override_settings
@@ -90,7 +90,7 @@ def dummy_external_site_view(request):
 
 
 urlpatterns = [
-    # Needed for rendering of base template that calls reverse('external-site')
+    # Needed for rendering of base template that calls reverse("external-site")
     re_path(r'^external-site/$', dummy_external_site_view,
             name='external-site'),
 

cfgov/core/tests/test_views.py

@@ -4,6 +4,7 @@
 
 from django.http import Http404, QueryDict
 from django.test import RequestFactory, TestCase, override_settings
+from django.urls import reverse
 
 from mock import Mock, patch
 from requests_toolbelt.multipart.encoder import MultipartEncoder
@@ -15,12 +16,6 @@
 )
 
 
-try:
-    from django.urls import reverse
-except ImportError:
-    from django.core.urlresolvers import reverse
-
-
 class GovDeliverySubscribeTest(TestCase):
     def setUp(self):
         self.factory = RequestFactory()

cfgov/core/tests/testutils/test_mock_staticfiles.py

@@ -38,7 +38,7 @@ def test_filesystem_finder_finds_test_file(self):
 
         This test serves as a baseline to demonstrate default Django behavior.
         """
-        self.assertRegexpMatches(
+        self.assertRegex(
             finders.find('icons/test.svg'),
             'icons/test.svg$'
         )
@@ -101,7 +101,7 @@ def test_mock_finder_falls_back_to_filesystem_finder(self):
         icons/test.svg instead. Because we have a FileSystemFinder that can
         handle that redirected request, this call should succeed.
         """
-        self.assertRegexpMatches(
+        self.assertRegex(
             finders.find('missing/file.svg'),
             'icons/test.svg$'
         )

cfgov/core/utils.py

@@ -3,18 +3,13 @@
 
 from django.core.signing import Signer
 from django.template.defaultfilters import slugify
+from django.urls import reverse
 
 from bs4 import BeautifulSoup
 
 from core.templatetags.svg_icon import svg_icon
 
 
-try:
-    from django.urls import reverse
-except ImportError:
-    from django.core.urlresolvers import reverse
-
-
 NON_GOV_LINKS = re.compile(
     r'https?:\/\/(?:www\.)?(?![^\?]+gov)(?!(content\.)?localhost).*'
 )
@@ -66,12 +61,12 @@ def signed_redirect(url):
     query_args = {'ext_url': url,
                   'signature': signature}
 
-    return ('{0}?{1}'.format(reverse('external-site'), urlencode(query_args)))
+    return ("{0}?{1}".format(reverse("external-site"), urlencode(query_args)))
 
 
 def unsigned_redirect(url):
     query_args = {'ext_url': url}
-    return ('{0}?{1}'.format(reverse('external-site'), urlencode(query_args)))
+    return ("{0}?{1}".format(reverse("external-site"), urlencode(query_args)))
 
 
 def extract_answers_from_request(request):

cfgov/data_research/tests/test_views.py

@@ -3,6 +3,7 @@
 import unittest
 
 import django
+from django.urls import NoReverseMatch, reverse
 
 from model_bakery import baker
 
@@ -13,12 +14,6 @@
 from data_research.views import validate_year_month
 
 
-try:
-    from django.urls import NoReverseMatch, reverse
-except ImportError:
-    from django.core.urlresolvers import NoReverseMatch, reverse
-
-
 class YearMonthValidatorTests(unittest.TestCase):
     """check the year_month validator"""
 

cfgov/data_research/urls.py

@@ -1,33 +1,29 @@
+from django.urls import re_path
+
 from data_research.views import (
     MapData, MetaData, TimeSeriesData, TimeSeriesNational
 )
 
 
-try:
-    from django.urls import re_path
-except ImportError:
-    from django.conf.urls import url as re_path
-
-
 urlpatterns = [
     re_path(
-        r'^time-series/(?P<days_late>[3890-]*)/(?P<fips>[0-9non-]*)/?$',
+        r"^time-series/(?P<days_late>[3890-]*)/(?P<fips>[0-9non-]*)/?$",
         TimeSeriesData.as_view(),
-        name='data_research_api_mortgage_timeseries'
+        name="data_research_api_mortgage_timeseries",
     ),
     re_path(
-        r'^time-series/(?P<days_late>[3890-]*)/national/?$',
+        r"^time-series/(?P<days_late>[3890-]*)/national/?$",
         TimeSeriesNational.as_view(),
-        name='data_research_api_mortgage_timeseries_national'
+        name="data_research_api_mortgage_timeseries_national",
     ),
     re_path(
-        r'^map-data/(?P<days_late>[3890-]*)/(?P<geo>[a-z]*)/(?P<year_month>\d{4}-\d{2})/?$',  # noqa: E501
+        r"^map-data/(?P<days_late>[3890-]*)/(?P<geo>[a-z]*)/(?P<year_month>\d{4}-\d{2})/?$",  # noqa: E501
         MapData.as_view(),
-        name='data_research_api_mortgage_mapdata'
+        name="data_research_api_mortgage_mapdata",
     ),
     re_path(
-        r'^metadata/(?P<meta_name>[a-z_]*)/?$',
+        r"^metadata/(?P<meta_name>[a-z_]*)/?$",
         MetaData.as_view(),
-        name='data_research_api_metadata'
+        name="data_research_api_metadata",
     ),
 ]

cfgov/diversity_inclusion/tests/test_views.py

@@ -1,11 +1,6 @@
 from django.core import mail
 from django.test import TestCase
-
-
-try:
-    from django.urls import reverse
-except ImportError:
-    from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 
 class TestGetAssessmentForm(TestCase):

cfgov/diversity_inclusion/urls.py

@@ -1,32 +1,27 @@
+from django.urls import re_path
 from django.views.generic import TemplateView
 
 from diversity_inclusion.views import GetAssessmentForm
 
 
-try:
-    from django.urls import re_path
-except ImportError:
-    from django.conf.urls import url as re_path
-
-
 urlpatterns = [
     re_path(
-        r'^voluntary-assessment-onboarding-form/$(?i)',
+        r"^voluntary-assessment-onboarding-form/$(?i)",
         GetAssessmentForm.as_view(),
-        name='voluntary_assessment_form'
+        name="voluntary_assessment_form",
     ),
     re_path(
-        r'^voluntary-assessment-onboarding-form/form-submitted/$(?i)',
+        r"^voluntary-assessment-onboarding-form/form-submitted/$(?i)",
         TemplateView.as_view(
-            template_name='diversity_inclusion/form-submitted.html'
+            template_name="diversity_inclusion/form-submitted.html"
         ),
-        name='form_submitted'
+        name="form_submitted",
     ),
     re_path(
-        r'^voluntary-assessment-onboarding-form/privacy-act-statement/$(?i)',
+        r"^voluntary-assessment-onboarding-form/privacy-act-statement/$(?i)",
         TemplateView.as_view(
-            template_name='diversity_inclusion/privacy.html'
+            template_name="diversity_inclusion/privacy.html"
         ),
-        name='privacy'
+        name="privacy",
     ),
 ]