Merge pull request #193 from rloomans/django-3.1

django-3.1

requirements/base.txt

@@ -1,4 +1,4 @@
-Django==2.2.13
+Django==3.1
 django-bootstrap3==14.1.0
 dj-database-url==0.5.0
 dj-static==0.0.6

teamtemp/headers.py

@@ -5,8 +5,6 @@
 
 from functools import wraps
 
-from django.utils.decorators import available_attrs
-
 
 def header(name, value):
     # View decorator that sets a response header.
@@ -21,7 +19,7 @@ def header(name, value):
     # def get(self, request, ...)
     #     ...
     def decorator(func):
-        @wraps(func, assigned=available_attrs(func))
+        @wraps(func)
         def inner(request, *args, **kwargs):
             response = func(request, *args, **kwargs)
             response[name] = value

teamtemp/responses/forms.py

@@ -6,7 +6,6 @@
 from django import forms
 from django.forms.utils import ErrorList
 from django.utils import timezone
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 
@@ -62,7 +61,6 @@ def _check_passwords(obj, cleaned_data):
                           'New password and confirmation must match')
 
 
-@python_2_unicode_compatible
 class ErrorBox(ErrorList):
     def __str__(self):
         return mark_safe(self.as_box())

teamtemp/responses/models.py

@@ -8,10 +8,8 @@
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.utils import timezone
-from django.utils.encoding import python_2_unicode_compatible
 
 
-@python_2_unicode_compatible
 class WordCloudImage(models.Model):
     class Meta(object):
       unique_together = ("word_hash", "width", "height")
@@ -41,7 +39,6 @@ def clean(self):
             self.word_list.encode('utf-8')).hexdigest()
 
 
-@python_2_unicode_compatible
 class User(models.Model):
     id = models.CharField(max_length=32, primary_key=True)
     creation_date = models.DateTimeField(auto_now_add=True)
@@ -59,7 +56,6 @@ def _stats_for(query_set):
                     models.Count("id")).order_by()}, query_set
 
 
-@python_2_unicode_compatible
 class TeamTemperature(models.Model):
     TEAM_TEMP = 'TEAMTEMP'
     DEPT_REGION_SITE = 'DEPT-REGION-SITE'
@@ -177,7 +173,6 @@ def __str__(self):
             self.default_tz)
 
 
-@python_2_unicode_compatible
 class TemperatureResponse(models.Model):
     # class Meta:
     #     unique_together = ("request", "responder", "team_name", "archive_date")
@@ -218,7 +213,6 @@ def clean(self):
         self.word = self.word.lower().strip()
 
 
-@python_2_unicode_compatible
 class TeamResponseHistory(models.Model):
     class Meta(object):
         verbose_name_plural = "Team response histories"
@@ -263,7 +257,6 @@ def clean(self):
         self.word_list = self.word_list.lower().strip()
 
 
-@python_2_unicode_compatible
 class Teams(models.Model):
     class Meta(object):
         verbose_name = "Team"

teamtemp/templates/base.html

@@ -1,7 +1,7 @@
 {% extends 'bootstrap3/bootstrap3.html' %}
 
 {% load bootstrap3 %}
-{% load staticfiles %}
+{% load static %}
 
 {% block bootstrap3_title %}{% block title %}{% endblock %}{% endblock %}
 {% block bootstrap3_extra_head %}

teamtemp/templates/bvc.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% load bootstrap3 %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Results {{ survey.id }} {{ bvc_data.team_name }}{% endblock %}
 

teamtemp/templates/results.html

@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Admin {{ id }} {{ team_name }}{% endblock %}
 

teamtemp/tests/view/test_healthcheck_view.py

@@ -1,14 +1,12 @@
 from django.urls import reverse
 from django.test import TestCase
-from django.utils import six
 from rest_framework import status
 
-
 class HealthcheckViewTestCases(TestCase):
     def test_health_check_view(self):
         response = self.client.get(reverse('healthcheck'))
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response['Content-Type'], 'text/plain')
         self.assertTemplateNotUsed(response, 'index.html')
-        self.assertEqual(response.content, six.b('ok'))
+        self.assertEqual(response.content, b'ok')
         self.assertContains(response, 'ok')