From 5fd4cb5c78727e80a466294dc318873cf69b1c0a Mon Sep 17 00:00:00 2001 From: Ludovic Stephan Date: Tue, 19 Mar 2019 10:18:56 +0100 Subject: [PATCH 1/2] Change `django.core.urlresolvers` imports -- compatible with 1.11 -- --- bda/views.py | 2 +- gestioncof/admin.py | 2 +- gestioncof/views.py | 2 +- kfet/auth/signals.py | 2 +- kfet/auth/tests.py | 2 +- kfet/auth/views.py | 2 +- kfet/tests/test_views.py | 2 +- kfet/tests/testcases.py | 2 +- kfet/views.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bda/views.py b/bda/views.py index 2b02e203..c0f4a079 100644 --- a/bda/views.py +++ b/bda/views.py @@ -10,13 +10,13 @@ from django.conf import settings from django.contrib import messages from django.core import serializers from django.core.exceptions import NON_FIELD_ERRORS -from django.core.urlresolvers import reverse from django.db import transaction from django.db.models import Count, Prefetch from django.forms.models import inlineformset_factory from django.http import HttpResponseBadRequest, HttpResponseRedirect, JsonResponse from django.shortcuts import get_object_or_404, render from django.template.defaultfilters import pluralize +from django.urls import reverse from django.utils import formats, timezone from django.views.generic.list import ListView diff --git a/gestioncof/admin.py b/gestioncof/admin.py index e82f0a31..760c3e77 100644 --- a/gestioncof/admin.py +++ b/gestioncof/admin.py @@ -3,8 +3,8 @@ from django import forms from django.contrib import admin from django.contrib.auth.admin import UserAdmin from django.contrib.auth.models import Group, Permission, User -from django.core.urlresolvers import reverse from django.db.models import Q +from django.urls import reverse from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ diff --git a/gestioncof/views.py b/gestioncof/views.py index 618fb24a..4e6daa89 100644 --- a/gestioncof/views.py +++ b/gestioncof/views.py @@ -12,9 +12,9 @@ from django.contrib.auth.views import ( redirect_to_login, ) from django.contrib.sites.models import Site -from django.core.urlresolvers import reverse_lazy from django.http import Http404, HttpResponse, HttpResponseForbidden from django.shortcuts import get_object_or_404, redirect, render +from django.urls import reverse_lazy from django.utils import timezone from django.utils.translation import ugettext_lazy as _ from django.views.generic import FormView diff --git a/kfet/auth/signals.py b/kfet/auth/signals.py index c13cde09..3f691068 100644 --- a/kfet/auth/signals.py +++ b/kfet/auth/signals.py @@ -1,7 +1,7 @@ from django.contrib import messages from django.contrib.auth.signals import user_logged_in -from django.core.urlresolvers import reverse from django.dispatch import receiver +from django.urls import reverse from django.utils.safestring import mark_safe from django.utils.translation import ugettext as _ diff --git a/kfet/auth/tests.py b/kfet/auth/tests.py index e4330eef..5e284648 100644 --- a/kfet/auth/tests.py +++ b/kfet/auth/tests.py @@ -2,8 +2,8 @@ from unittest import mock from django.contrib.auth.models import AnonymousUser, Group, Permission, User from django.core import signing -from django.core.urlresolvers import reverse from django.test import RequestFactory, TestCase +from django.urls import reverse from kfet.forms import UserGroupForm from kfet.models import Account diff --git a/kfet/auth/views.py b/kfet/auth/views.py index 35a6eedf..5dd048e9 100644 --- a/kfet/auth/views.py +++ b/kfet/auth/views.py @@ -4,10 +4,10 @@ from django.contrib.auth.decorators import permission_required from django.contrib.auth.models import Group, User from django.contrib.auth.views import redirect_to_login from django.contrib.messages.views import SuccessMessageMixin -from django.core.urlresolvers import reverse, reverse_lazy from django.db.models import Prefetch from django.http import QueryDict from django.shortcuts import redirect, render +from django.urls import reverse, reverse_lazy from django.utils.decorators import method_decorator from django.utils.translation import ugettext_lazy as _ from django.views.decorators.http import require_http_methods diff --git a/kfet/tests/test_views.py b/kfet/tests/test_views.py index e5ccfaa1..5c55f150 100644 --- a/kfet/tests/test_views.py +++ b/kfet/tests/test_views.py @@ -4,8 +4,8 @@ from decimal import Decimal from unittest import mock from django.contrib.auth.models import Group -from django.core.urlresolvers import reverse from django.test import Client, TestCase +from django.urls import reverse from django.utils import timezone from ..config import kfet_config diff --git a/kfet/tests/testcases.py b/kfet/tests/testcases.py index 36a4ab65..95b48d42 100644 --- a/kfet/tests/testcases.py +++ b/kfet/tests/testcases.py @@ -1,9 +1,9 @@ from unittest import mock from urllib.parse import parse_qs, urlparse -from django.core.urlresolvers import reverse from django.http import QueryDict from django.test import Client +from django.urls import reverse from django.utils import timezone from django.utils.functional import cached_property diff --git a/kfet/views.py b/kfet/views.py index 51bfc1a4..9ce17f47 100644 --- a/kfet/views.py +++ b/kfet/views.py @@ -10,12 +10,12 @@ from django.contrib.auth.decorators import login_required, permission_required from django.contrib.auth.models import Permission, User from django.contrib.messages.views import SuccessMessageMixin from django.core.exceptions import PermissionDenied -from django.core.urlresolvers import reverse, reverse_lazy from django.db import transaction from django.db.models import Count, F, Prefetch, Sum from django.forms import formset_factory from django.http import Http404, JsonResponse from django.shortcuts import get_object_or_404, redirect, render +from django.urls import reverse, reverse_lazy from django.utils import timezone from django.utils.decorators import method_decorator from django.views.generic import DetailView, FormView, ListView, TemplateView From 676239ad246433cb7c02141047438c637d4bac97 Mon Sep 17 00:00:00 2001 From: Ludovic Stephan Date: Tue, 19 Mar 2019 17:07:33 +0100 Subject: [PATCH 2/2] Remove `urlresolvers` mentions in packages On bump quelques versions, et on vire `django_debug_panel` --- requirements-devel.txt | 1 - requirements.txt | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/requirements-devel.txt b/requirements-devel.txt index 6a5acdd7..7907bcd9 100644 --- a/requirements-devel.txt +++ b/requirements-devel.txt @@ -1,6 +1,5 @@ -r requirements.txt django-debug-toolbar -django-debug-panel ipython # Tools diff --git a/requirements.txt b/requirements.txt index 73b3d78f..6386229b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ configparser==3.5.0 Django==1.11.* -django-autocomplete-light==3.1.3 +django-autocomplete-light==3.3.* django-autoslug==1.9.3 -django-cas-ng==3.5.7 +django-cas-ng==3.5.* django-djconfig==0.8.0 django-recaptcha==1.4.0 django-redis-cache==1.8.1 @@ -22,7 +22,7 @@ channels==1.1.5 python-dateutil wagtail==2.3.* wagtailmenus==2.12.* -wagtail-modeltranslation==0.9.* +wagtail-modeltranslation==0.10.* django-cors-headers==2.2.0 # Production tools