From d899260600ea4936bf7ed9c9534d8437d0ad7523 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Tue, 28 Mar 2017 13:52:59 +0200 Subject: [PATCH] django 1.10 --- apps/catalogue/templates/catalogue/base.html | 2 +- apps/fileupload/urls.py | 5 ++--- apps/forms_builder/forms/admin.py | 2 +- apps/wiki/templates/wiki/bootstrap.html | 2 +- redakcja/templates/registration/head_login.html | 4 ++-- requirements.txt | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/apps/catalogue/templates/catalogue/base.html b/apps/catalogue/templates/catalogue/base.html index 41476e94..8e1c92e9 100644 --- a/apps/catalogue/templates/catalogue/base.html +++ b/apps/catalogue/templates/catalogue/base.html @@ -1,7 +1,7 @@ {% load i18n %} {% load catalogue %} {% load javascript stylesheet from pipeline %} -{% load static from staticfiles %} +{% load static %} diff --git a/apps/fileupload/urls.py b/apps/fileupload/urls.py index 68bdc482..1098ec64 100644 --- a/apps/fileupload/urls.py +++ b/apps/fileupload/urls.py @@ -3,10 +3,9 @@ # This file is part of MIL/PEER, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # -from django.conf.urls import patterns, url +from django.conf.urls import url from fileupload.views import UploadView -urlpatterns = patterns( - '', +urlpatterns = ( url(r'^(?P(?:.*/)?)$', UploadView.as_view(), name='fileupload'), ) diff --git a/apps/forms_builder/forms/admin.py b/apps/forms_builder/forms/admin.py index e1dd26df..bef87fe5 100644 --- a/apps/forms_builder/forms/admin.py +++ b/apps/forms_builder/forms/admin.py @@ -7,7 +7,7 @@ from os.path import join from datetime import datetime from io import BytesIO, StringIO -from django.conf.urls import patterns, url +from django.conf.urls import url from django.contrib import admin from django.core.files.storage import FileSystemStorage from django.core.urlresolvers import reverse diff --git a/apps/wiki/templates/wiki/bootstrap.html b/apps/wiki/templates/wiki/bootstrap.html index 01f4989d..4e4e9479 100644 --- a/apps/wiki/templates/wiki/bootstrap.html +++ b/apps/wiki/templates/wiki/bootstrap.html @@ -17,7 +17,7 @@ {% endif %} {% endif %} - + {% if DEBUG %} diff --git a/redakcja/templates/registration/head_login.html b/redakcja/templates/registration/head_login.html index a4591afd..0c13ac8a 100644 --- a/redakcja/templates/registration/head_login.html +++ b/redakcja/templates/registration/head_login.html @@ -4,10 +4,10 @@
  • -
    + {% csrf_token %}
    | -
    + {% csrf_token %}
    |     diff --git a/requirements.txt b/requirements.txt index b4f33054..d8d3bf5b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ httplib2 # oauth2 dependency # git+git://github.com/fnp/librarian.git@master#egg=librarian ## Django -Django>=1.9,<1.10 +Django>=1.10,<1.11 fnpdjango>=0.2,<0.3 django-pipeline>=1.6,<1.7 sorl-thumbnail>=12.3,<13 -- 2.20.1