From d63e92fee8611b378d140afb179fef67b205aef3 Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yb@enix.org>
Date: Wed, 15 Aug 2018 17:42:51 +0200
Subject: [PATCH] Upgrade to Django 2.1

---
 requirements.txt               | 2 +-
 umap/templatetags/umap_tags.py | 2 +-
 umap/urls.py                   | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 1fa81d52..03a6340e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Django==2.0.7
+Django==2.1
 django-agnocomplete==0.12.2
 django-compressor==2.2
 Pillow==5.2.0
diff --git a/umap/templatetags/umap_tags.py b/umap/templatetags/umap_tags.py
index d6be5091..86a2bbeb 100644
--- a/umap/templatetags/umap_tags.py
+++ b/umap/templatetags/umap_tags.py
@@ -77,7 +77,7 @@ def notag(s):
 @register.simple_tag(takes_context=True)
 def paginate_querystring(context, page):
     qs = copy(context["request"].GET)
-    qs["p"] = page
+    qs["p"] = str(page)
     return qs.urlencode()
 
 
diff --git a/umap/urls.py b/umap/urls.py
index 44a7535a..c5169cfd 100644
--- a/umap/urls.py
+++ b/umap/urls.py
@@ -1,11 +1,9 @@
 from django.conf import settings
 from django.conf.urls import include, url
-from django.urls import path
 from django.conf.urls.i18n import i18n_patterns
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.contrib.auth import views as auth_views
-from django.contrib.auth.views import login
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.views.decorators.cache import (cache_control, cache_page,
                                            never_cache)
@@ -25,10 +23,10 @@ urlpatterns = [
         name='map_short_url'),
     url(r'^ajax-proxy/$', cache_page(180)(views.ajax_proxy),
         name='ajax-proxy'),
-    url(r'^change-password/', auth_views.password_change,
+    url(r'^change-password/', auth_views.PasswordChangeView.as_view(),
         {'template_name': 'umap/password_change.html'},
         name='password_change'),
-    url(r'^change-password-done/', auth_views.password_change_done,
+    url(r'^change-password-done/', auth_views.PasswordChangeDoneView.as_view(),
         {'template_name': 'umap/password_change_done.html'},
         name='password_change_done'),
     url(r'^i18n/', include('django.conf.urls.i18n')),
@@ -36,7 +34,7 @@ urlpatterns = [
 ]
 
 i18n_urls = [
-    url(r'^login/$', jsonize_view(login), name='login'),  # noqa
+    url(r'^login/$', jsonize_view(auth_views.LoginView.as_view()), name='login'),  # noqa
     url(r'^login/popup/end/$', views.LoginPopupEnd.as_view(),
         name='login_popup_end'),
     url(r'^logout/$', views.logout, name='logout'),