Bump to Django 3 instead

Author: vdboor

src/djangofluent/apps/themeelements/models.py

@@ -1,22 +1,15 @@
 import json
+from urllib.request import urlopen
+from urllib.error import HTTPError
 from django.conf import settings
 from django.core.cache import cache
 from django.db import models
-from django.utils.six import python_2_unicode_compatible
 from django.utils.functional import cached_property
 from django.utils.translation import ugettext_lazy as _
 from fluent_contents.extensions import PluginImageField, PluginHtmlField, PluginUrlField
 from fluent_contents.models import ContentItem
 
-try:
-    # Python 3
-    from urllib.request import urlopen
-    from urllib.error import HTTPError
-except ImportError:
-    from urllib2 import urlopen, HTTPError  # Python 2
 
-
-@python_2_unicode_compatible
 class Col12Item(ContentItem):
     """
     A column that takes 1/2 of the width
@@ -33,7 +26,6 @@ def __str__(self):
         return self.title
 
 
-@python_2_unicode_compatible
 class ContentBoxItem(ContentItem):
     """
     The context box includes a divider.
@@ -46,7 +38,6 @@ def __str__(self):
         return u'splitter'
 
 
-@python_2_unicode_compatible
 class ImageTextItem(ContentItem):
     """
     A block with image + text
@@ -81,7 +72,6 @@ def image_css_class(self):
             return 'image_fl'
 
 
-@python_2_unicode_compatible
 class PackageItem(ContentItem):
     """
     An item on the page that describes a Python package.

src/requirements/base.in

@@ -1,7 +1,7 @@
 # Install with: `pip install -r requirements/base.txt`
 
 # Infrastructure
-Django == 2.2.24
+Django == 3.2.5
 Pillow == 8.3.1
 psycopg2 == 2.9.1
 python-memcached == 1.59

src/requirements/base.txt

@@ -4,6 +4,8 @@
 #
 #    pip-compile --output-file=requirements/base.txt requirements/base.in
 #
+asgiref==3.4.1
+    # via django
 attrs==21.2.0
     # via pytest
 beautifulsoup4==4.9.3
@@ -22,7 +24,7 @@ coverage==5.5
     # via
     #   -r requirements/base.in
     #   pytest-cov
-django==2.2.24
+django==3.2.5
     # via
     #   -r requirements/base.in
     #   django-appconf