diff --git a/accounting/models.py b/accounting/models.py index efcbdf2c..a04af851 100644 --- a/accounting/models.py +++ b/accounting/models.py @@ -22,7 +22,7 @@ # # -from django.core.urlresolvers import reverse +from django.urls import reverse from django.core.exceptions import ValidationError from django.core import validators from django.db import models diff --git a/accounting/tests.py b/accounting/tests.py index df4fd8d7..96b19010 100644 --- a/accounting/tests.py +++ b/accounting/tests.py @@ -23,7 +23,7 @@ # from django.test import TestCase -from django.core.urlresolvers import reverse +from django.urls import reverse from django.core.management import call_command from datetime import date diff --git a/accounting/views.py b/accounting/views.py index 35c2c4ea..693884cf 100644 --- a/accounting/views.py +++ b/accounting/views.py @@ -24,7 +24,7 @@ from django.views.generic import ListView, DetailView from django.views.generic.edit import UpdateView, CreateView, DeleteView, FormView -from django.core.urlresolvers import reverse_lazy, reverse +from django.urls import reverse_lazy, reverse from django.utils.translation import ugettext_lazy as _ from django.forms.models import modelform_factory from django.core.exceptions import PermissionDenied, ValidationError diff --git a/club/models.py b/club/models.py index 5f0b58dd..94b0b477 100644 --- a/club/models.py +++ b/club/models.py @@ -29,7 +29,7 @@ from django.conf import settings from django.utils.translation import ugettext_lazy as _ from django.core.exceptions import ValidationError, ObjectDoesNotExist from django.db import transaction -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils import timezone from django.core.validators import RegexValidator, validate_email from django.utils.functional import cached_property diff --git a/club/tests.py b/club/tests.py index 6bce1166..2536390e 100644 --- a/club/tests.py +++ b/club/tests.py @@ -26,7 +26,7 @@ from django.conf import settings from django.test import TestCase from django.utils import timezone, html from django.utils.translation import ugettext as _ -from django.core.urlresolvers import reverse +from django.urls import reverse from django.core.management import call_command from django.core.exceptions import ValidationError, NON_FIELD_ERRORS diff --git a/club/views.py b/club/views.py index a654ed65..da9824e2 100644 --- a/club/views.py +++ b/club/views.py @@ -31,7 +31,7 @@ from django.views.generic.edit import DeleteView from django.views.generic.detail import SingleObjectMixin from django.views.generic.edit import UpdateView, CreateView from django.http import HttpResponseRedirect, HttpResponse, Http404 -from django.core.urlresolvers import reverse, reverse_lazy +from django.urls import reverse, reverse_lazy from django.utils import timezone from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext as _t diff --git a/com/tests.py b/com/tests.py index 2e8f148a..6ceb1f17 100644 --- a/com/tests.py +++ b/com/tests.py @@ -24,7 +24,7 @@ from django.test import TestCase from django.conf import settings -from django.core.urlresolvers import reverse +from django.urls import reverse from django.core.management import call_command from django.utils import html from django.utils.translation import ugettext as _ diff --git a/com/views.py b/com/views.py index 21bbf8c7..dd972522 100644 --- a/com/views.py +++ b/com/views.py @@ -29,7 +29,7 @@ from django.views.generic import ListView, DetailView, View from django.views.generic.edit import UpdateView, CreateView, DeleteView from django.views.generic.detail import SingleObjectMixin from django.utils.translation import ugettext_lazy as _ -from django.core.urlresolvers import reverse, reverse_lazy +from django.urls import reverse, reverse_lazy from django.core.exceptions import ValidationError from django.utils import timezone from django.conf import settings diff --git a/core/markdown.py b/core/markdown.py index c5d69a6c..8ce70265 100644 --- a/core/markdown.py +++ b/core/markdown.py @@ -25,7 +25,7 @@ import os import re from mistune import Renderer, InlineGrammar, InlineLexer, Markdown, escape, escape_link -from django.core.urlresolvers import reverse +from django.urls import reverse class SithRenderer(Renderer): diff --git a/core/models.py b/core/models.py index d27a2f79..4a9e5dbc 100644 --- a/core/models.py +++ b/core/models.py @@ -38,7 +38,7 @@ from django.utils.translation import ugettext_lazy as _ from django.utils import timezone from django.core import validators from django.core.exceptions import ValidationError, PermissionDenied -from django.core.urlresolvers import reverse +from django.urls import reverse from django.conf import settings from django.db import transaction from django.contrib.staticfiles.storage import staticfiles_storage diff --git a/core/tests.py b/core/tests.py index 71898662..cb0c986b 100644 --- a/core/tests.py +++ b/core/tests.py @@ -25,7 +25,7 @@ import os from django.test import Client, TestCase -from django.core.urlresolvers import reverse +from django.urls import reverse from django.core.management import call_command from core.models import User, Group, Page diff --git a/core/views/files.py b/core/views/files.py index 683a6f1e..4117dc2d 100644 --- a/core/views/files.py +++ b/core/views/files.py @@ -32,7 +32,7 @@ from django.conf import settings from django.utils.translation import ugettext_lazy as _ from django.http import HttpResponse from wsgiref.util import FileWrapper -from django.core.urlresolvers import reverse +from django.urls import reverse from django.core.exceptions import PermissionDenied from django import forms diff --git a/core/views/forms.py b/core/views/forms.py index 2d5bbf6d..0c557749 100644 --- a/core/views/forms.py +++ b/core/views/forms.py @@ -27,7 +27,7 @@ from django import forms from django.conf import settings from django.db import transaction from django.templatetags.static import static -from django.core.urlresolvers import reverse +from django.urls import reverse from django.core.exceptions import ValidationError from django.forms import ( CheckboxSelectMultiple, diff --git a/core/views/group.py b/core/views/group.py index 059c5dc5..ca51a9d7 100644 --- a/core/views/group.py +++ b/core/views/group.py @@ -29,7 +29,7 @@ from django.views.generic.edit import UpdateView, CreateView, DeleteView from django.views.generic import ListView from django.views.generic.edit import FormView -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy from django.shortcuts import get_object_or_404 from django.utils.translation import ugettext_lazy as _ from django import forms diff --git a/core/views/page.py b/core/views/page.py index 92b9b381..8a5e10ac 100644 --- a/core/views/page.py +++ b/core/views/page.py @@ -23,7 +23,7 @@ # # This file contains all the views that concern the page model -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy from django.views.generic import ListView, DetailView from django.views.generic.edit import UpdateView, CreateView, DeleteView from django.forms.models import modelform_factory diff --git a/core/views/user.py b/core/views/user.py index aa3ea805..bd3b00ab 100644 --- a/core/views/user.py +++ b/core/views/user.py @@ -27,7 +27,7 @@ from django.shortcuts import render, redirect, get_object_or_404 from django.contrib.auth import views from django.utils.translation import ugettext as _ -from django.core.urlresolvers import reverse +from django.urls import reverse from django.core.exceptions import PermissionDenied, ValidationError from django.http import Http404, HttpResponse from django.views.generic.edit import UpdateView @@ -40,7 +40,7 @@ from django.views.generic import ( ) from django.forms.models import modelform_factory from django.forms import CheckboxSelectMultiple -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy from django.template.response import TemplateResponse from django.conf import settings from django.views.generic.dates import YearMixin, MonthMixin diff --git a/counter/models.py b/counter/models.py index 703f2404..ead3e778 100644 --- a/counter/models.py +++ b/counter/models.py @@ -26,7 +26,7 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ from django.utils import timezone from django.conf import settings -from django.core.urlresolvers import reverse +from django.urls import reverse from django.core.validators import MinLengthValidator from django.forms import ValidationError from django.utils.functional import cached_property diff --git a/counter/tests.py b/counter/tests.py index 1e956916..a2fd6303 100644 --- a/counter/tests.py +++ b/counter/tests.py @@ -25,7 +25,7 @@ import re from django.test import TestCase -from django.core.urlresolvers import reverse +from django.urls import reverse from django.core.management import call_command from core.models import User diff --git a/counter/views.py b/counter/views.py index 42cff108..7f72434e 100644 --- a/counter/views.py +++ b/counter/views.py @@ -37,7 +37,7 @@ from django.views.generic.edit import ( ) from django.forms.models import modelform_factory from django.forms import CheckboxSelectMultiple -from django.core.urlresolvers import reverse_lazy, reverse +from django.urls import reverse_lazy, reverse from django.http import HttpResponseRedirect, HttpResponse from django.utils import timezone from django import forms diff --git a/eboutic/tests.py b/eboutic/tests.py index b0ee0214..0587fde9 100644 --- a/eboutic/tests.py +++ b/eboutic/tests.py @@ -29,7 +29,7 @@ import urllib from OpenSSL import crypto from django.test import TestCase -from django.core.urlresolvers import reverse +from django.urls import reverse from django.core.management import call_command from django.conf import settings diff --git a/eboutic/views.py b/eboutic/views.py index afd68320..927f01a3 100644 --- a/eboutic/views.py +++ b/eboutic/views.py @@ -28,7 +28,7 @@ import hmac import base64 from OpenSSL import crypto -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy from django.views.generic import TemplateView, View from django.http import HttpResponse, HttpResponseRedirect from django.core.exceptions import SuspiciousOperation diff --git a/election/tests.py b/election/tests.py index 1675d224..31934187 100644 --- a/election/tests.py +++ b/election/tests.py @@ -1,5 +1,5 @@ from django.test import TestCase -from django.core.urlresolvers import reverse +from django.urls import reverse from django.core.management import call_command from django.conf import settings diff --git a/election/views.py b/election/views.py index 92553bb2..c142e6d0 100644 --- a/election/views.py +++ b/election/views.py @@ -2,7 +2,7 @@ from django.shortcuts import get_object_or_404 from django.views.generic import ListView, DetailView from django.views.generic.edit import UpdateView, CreateView from django.views.generic.edit import DeleteView, FormView -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy from django.utils.translation import ugettext_lazy as _ from django.core.exceptions import PermissionDenied from django.db import transaction diff --git a/forum/models.py b/forum/models.py index 4ef955ba..698303f8 100644 --- a/forum/models.py +++ b/forum/models.py @@ -26,7 +26,7 @@ from django.db import models from django.conf import settings from django.utils.translation import ugettext_lazy as _ from django.core.exceptions import ValidationError -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils import timezone from django.utils.functional import cached_property diff --git a/forum/views.py b/forum/views.py index 49cee753..11ab52ad 100644 --- a/forum/views.py +++ b/forum/views.py @@ -28,7 +28,7 @@ from django.views.generic import ListView, DetailView, RedirectView from django.views.generic.edit import UpdateView, CreateView, DeleteView from django.views.generic.detail import SingleObjectMixin from django.utils.translation import ugettext_lazy as _ -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy from django.utils import timezone, html from django.conf import settings from django import forms diff --git a/launderette/models.py b/launderette/models.py index 0c92c8d7..acc2bb20 100644 --- a/launderette/models.py +++ b/launderette/models.py @@ -25,7 +25,7 @@ from django.db import models, DataError from django.utils.translation import ugettext_lazy as _ from django.conf import settings -from django.core.urlresolvers import reverse +from django.urls import reverse from counter.models import Counter from core.models import User diff --git a/launderette/views.py b/launderette/views.py index 0b920ac1..dcf0ffda 100644 --- a/launderette/views.py +++ b/launderette/views.py @@ -30,7 +30,7 @@ from django.views.generic import ListView, DetailView, TemplateView from django.views.generic.edit import UpdateView, CreateView, DeleteView, BaseFormView from django.utils.translation import ugettext as _ from django.utils import dateparse, timezone -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy from django.conf import settings from django.db import transaction, DataError from django import forms diff --git a/matmat/views.py b/matmat/views.py index e1a541d0..2a76e764 100644 --- a/matmat/views.py +++ b/matmat/views.py @@ -29,7 +29,7 @@ from django.views.generic.edit import FormView from django.utils.translation import ugettext_lazy as _ from django.views.generic.detail import SingleObjectMixin from django.http.response import HttpResponseRedirect -from django.core.urlresolvers import reverse +from django.urls import reverse from django import forms from core.models import User diff --git a/pedagogy/models.py b/pedagogy/models.py index b588cb20..0b3cfda2 100644 --- a/pedagogy/models.py +++ b/pedagogy/models.py @@ -28,7 +28,7 @@ from django.utils import timezone from django.core import validators from django.conf import settings from django.utils.functional import cached_property -from django.core.urlresolvers import reverse +from django.urls import reverse from rest_framework import serializers diff --git a/pedagogy/tests.py b/pedagogy/tests.py index 121e511a..be40d704 100644 --- a/pedagogy/tests.py +++ b/pedagogy/tests.py @@ -24,7 +24,7 @@ from django.conf import settings from django.test import TestCase -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils.translation import ugettext_lazy as _ from django.core.management import call_command diff --git a/rootplace/views.py b/rootplace/views.py index 70dce63e..41a9690a 100644 --- a/rootplace/views.py +++ b/rootplace/views.py @@ -25,7 +25,7 @@ from django.utils.translation import ugettext as _ from django.views.generic.edit import FormView -from django.core.urlresolvers import reverse +from django.urls import reverse from django import forms from django.core.exceptions import PermissionDenied diff --git a/sas/models.py b/sas/models.py index 2a691f38..40063328 100644 --- a/sas/models.py +++ b/sas/models.py @@ -23,7 +23,7 @@ # from django.db import models -from django.core.urlresolvers import reverse +from django.urls import reverse from django.core.cache import cache from django.conf import settings from django.utils.translation import ugettext_lazy as _ diff --git a/sas/views.py b/sas/views.py index 6cbdc319..d2f7b889 100644 --- a/sas/views.py +++ b/sas/views.py @@ -24,7 +24,7 @@ from django.shortcuts import redirect from django.http import HttpResponse, Http404 -from django.core.urlresolvers import reverse_lazy, reverse +from django.urls import reverse_lazy, reverse from core.views.forms import SelectDate from django.views.generic import DetailView, TemplateView from django.views.generic.edit import UpdateView, FormMixin, FormView diff --git a/stock/models.py b/stock/models.py index 381278b2..3df2414e 100644 --- a/stock/models.py +++ b/stock/models.py @@ -25,7 +25,7 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ -from django.core.urlresolvers import reverse +from django.urls import reverse from django.conf import settings diff --git a/stock/views.py b/stock/views.py index 6a911164..d0ebee04 100644 --- a/stock/views.py +++ b/stock/views.py @@ -41,7 +41,7 @@ from django.utils.translation import ugettext_lazy as _ from django import forms from django.http import HttpResponseRedirect, HttpResponse from django.forms.models import modelform_factory -from django.core.urlresolvers import reverse_lazy, reverse +from django.urls import reverse_lazy, reverse from django.db import transaction, DataError from core.views import ( diff --git a/subscription/models.py b/subscription/models.py index 21bc91b3..11e80eeb 100644 --- a/subscription/models.py +++ b/subscription/models.py @@ -28,7 +28,7 @@ from django.utils import timezone from django.utils.translation import ugettext_lazy as _ from django.conf import settings from django.core.exceptions import ValidationError -from django.core.urlresolvers import reverse +from django.urls import reverse from django.contrib.auth.forms import PasswordResetForm from dateutil.relativedelta import relativedelta diff --git a/subscription/views.py b/subscription/views.py index 0d91c6be..1949c2a5 100644 --- a/subscription/views.py +++ b/subscription/views.py @@ -25,7 +25,7 @@ from django.views.generic.edit import CreateView, FormView from django.utils.translation import ugettext_lazy as _ from django.core.exceptions import PermissionDenied, ValidationError -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy from django import forms from django.conf import settings diff --git a/trombi/models.py b/trombi/models.py index f60400de..c4e33a69 100644 --- a/trombi/models.py +++ b/trombi/models.py @@ -24,7 +24,7 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ -from django.core.urlresolvers import reverse +from django.urls import reverse from django.conf import settings from django.core.exceptions import ValidationError diff --git a/trombi/views.py b/trombi/views.py index 06dd43e7..2f21a68d 100644 --- a/trombi/views.py +++ b/trombi/views.py @@ -24,7 +24,7 @@ from django.http import Http404, HttpResponseRedirect from django.shortcuts import get_object_or_404, redirect -from django.core.urlresolvers import reverse_lazy, reverse +from django.urls import reverse_lazy, reverse from django.views.generic import DetailView, RedirectView, TemplateView, View from django.views.generic.edit import UpdateView, CreateView, DeleteView from django.utils.translation import ugettext_lazy as _