From b95e5e7190df5bba502336f56efa814e9917e991 Mon Sep 17 00:00:00 2001
From: Janis Streib <janis@dogcraft.de>
Date: Fri, 7 Jun 2019 15:03:29 +0200
Subject: [PATCH] FIX: upgraded to latest django

---
 requirements.txt | 28 ++++++++++++++--------------
 roms/forms.py    |  2 +-
 roms/models.py   |  4 ++--
 users/urls.py    | 20 ++++++++++----------
 users/views.py   |  2 +-
 5 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 28fc5a3..2c871ec 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,14 @@
-appdirs==1.4.0
-Django==1.10.5
-django-autocomplete-light==3.2.7
-django-stdimage==2.4.1
-django-taggit==0.22.0
-django-taggit-helpers==0.1.4
-olefile==0.44
-packaging==16.8
-Pillow==4.0.0
-progressbar2==3.20.0
-pyparsing==2.1.10
-python-utils==2.1.0
-six==1.10.0
-uWSGI==2.0.15
+appdirs>=1.4.0
+Django>=1.10.5
+django-autocomplete-light>=3.2.7
+django-stdimage>=2.4.1
+django-taggit>=0.22.0
+django-taggit-helpers>=0.1.4
+olefile>=0.44
+packaging>=16.8
+Pillow>=4.0.0
+progressbar2>=3.20.0
+pyparsing>=2.1.10
+python-utils>=2.1.0
+six>=1.10.0
+uWSGI>=2.0.15
diff --git a/roms/forms.py b/roms/forms.py
index 98d5be8..112fecf 100644
--- a/roms/forms.py
+++ b/roms/forms.py
@@ -1,7 +1,7 @@
 from dal import autocomplete
 
 from django.forms import ModelForm
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 
 from roms.models import Rom
 
diff --git a/roms/models.py b/roms/models.py
index e3947c6..7426091 100644
--- a/roms/models.py
+++ b/roms/models.py
@@ -3,7 +3,7 @@ import uuid
 
 from django.db import models
 from django.core.exceptions import ValidationError
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from taggit.managers import TaggableManager
 
@@ -32,7 +32,7 @@ class Rom(models.Model):
     high_binary = models.FileField("high binary", upload_to = upload_binary_to)
     approved = models.BooleanField("approved", default=False)
     tags = TaggableManager(blank = True)
-    user = models.ForeignKey(User, blank=True, null=True)
+    user = models.ForeignKey(User, blank=True, null=True, on_delete=models.PROTECT)
     download_count = models.IntegerField(default = 0)
     creation_time = models.DateTimeField("creation time", auto_now_add = True)
     edit_time = models.DateTimeField("edit time", auto_now = True)
diff --git a/users/urls.py b/users/urls.py
index 14490e5..d28e871 100644
--- a/users/urls.py
+++ b/users/urls.py
@@ -1,7 +1,7 @@
 from django.conf.urls import include, url
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 
-from django.contrib.auth.views import password_reset, password_reset_confirm, password_reset_done, login, logout
+from django.contrib.auth.views import PasswordResetView, PasswordResetConfirmView, PasswordResetDoneView, LoginView, LogoutView
 
 
 from users.views import *
@@ -13,18 +13,18 @@ urlpatterns = [
 
 	url(r'^update/(?P<user_id>\d+)/$', UserUpdateView.as_view(), name='user_update'),
 
-	url(r'^password/reset/$', password_reset, {'template_name' : 'users/password_reset.html',
-											'post_reset_redirect' : reverse_lazy('password_reset_sent')},
+	url(r'^password/reset/$', PasswordResetView.as_view(**{'template_name' : 'users/password_reset.html',
+											'success_url' : reverse_lazy('password_reset_sent')}),
 											name='password_reset'),
 
-	url(r'^password/reset/(?P<uidb64>[0-9A-Za-z]+)/(?P<token>.+)/$', password_reset_confirm,
-														{'template_name' : 'users/password_reset_confirm.html',
-														'post_reset_redirect' : reverse_lazy('login')},
+	url(r'^password/reset/(?P<uidb64>[0-9A-Za-z]+)/(?P<token>.+)/$', PasswordResetConfirmView.as_view(
+											                        **{'template_name' : 'users/password_reset_confirm.html',
+														'success_url' : reverse_lazy('login')}),
 														name='password_reset_confirm'),
 
-	url(r'^password/reset/sent/$', password_reset_done, { 'template_name' : 'users/password_reset_sent.html',},
+	url(r'^password/reset/sent/$', PasswordResetDoneView.as_view(**{ 'template_name' : 'users/password_reset_sent.html',}),
 														name='password_reset_sent'),
 
-	url(r'^login/$', login, {'template_name' : 'users/login.html'}, name='login'),
-	url(r'^logout/$', logout ,{'next_page' : reverse_lazy('login')}, name='logout')
+	url(r'^login/$', LoginView.as_view(**{'template_name' : 'users/login.html'}), name='login'),
+	url(r'^logout/$', LogoutView.as_view(**{'next_page' : reverse_lazy('login')}), name='logout')
 ]
diff --git a/users/views.py b/users/views.py
index 17c6f5a..3359639 100644
--- a/users/views.py
+++ b/users/views.py
@@ -1,7 +1,7 @@
 from django.views.generic.edit import CreateView, UpdateView
 from django.views.generic.base import TemplateView
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.auth.tokens import default_token_generator
 from django.template import loader
 from django.utils.http import int_to_base36