From f6d647d0d52dcd2d3697547b9d92ea5f37917001 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20K=C3=B6gl?= Date: Fri, 23 Jun 2017 21:08:14 -0400 Subject: [PATCH] Import View from django.views https://docs.djangoproject.com/en/dev/releases/1.10/#generic-views --- mygpo/api/__init__.py | 2 +- mygpo/api/advanced/updates.py | 2 +- mygpo/directory/views.py | 3 ++- mygpo/podcastlists/views.py | 2 +- mygpo/pubsub/views.py | 2 +- mygpo/share/userpage.py | 2 +- mygpo/share/views.py | 2 +- mygpo/users/views/registration.py | 2 +- mygpo/users/views/user.py | 3 ++- mygpo/web/logo.py | 2 +- mygpo/web/views.py | 2 +- 11 files changed, 13 insertions(+), 11 deletions(-) diff --git a/mygpo/api/__init__.py b/mygpo/api/__init__.py index b9851c90..04135a8f 100644 --- a/mygpo/api/__init__.py +++ b/mygpo/api/__init__.py @@ -22,7 +22,7 @@ from django.http import HttpResponseBadRequest, HttpResponseNotFound from django.views.decorators.csrf import csrf_exempt from django.views.decorators.cache import never_cache from django.utils.decorators import method_decorator -from django.views.generic.base import View +from django.views import View from mygpo.utils import parse_request_body from mygpo.api.exceptions import ParameterMissing diff --git a/mygpo/api/advanced/updates.py b/mygpo/api/advanced/updates.py index 26dbb2b6..f005affb 100644 --- a/mygpo/api/advanced/updates.py +++ b/mygpo/api/advanced/updates.py @@ -23,7 +23,7 @@ from django.contrib.sites.requests import RequestSite from django.views.decorators.csrf import csrf_exempt from django.views.decorators.cache import never_cache from django.utils.decorators import method_decorator -from django.views.generic.base import View +from django.views import View from mygpo.podcasts.models import Episode from mygpo.api.httpresponse import JsonResponse diff --git a/mygpo/directory/views.py b/mygpo/directory/views.py index caaa3260..bf6fdcaf 100644 --- a/mygpo/directory/views.py +++ b/mygpo/directory/views.py @@ -14,7 +14,8 @@ from django.views.decorators.cache import cache_control from django.views.decorators.vary import vary_on_cookie from django.views.generic import ListView from django.utils.decorators import method_decorator -from django.views.generic.base import View, TemplateView +from django.views import View +from django.views.generic import TemplateView from django.contrib.auth.decorators import login_required from django.contrib import messages from django.utils.translation import ugettext as _ diff --git a/mygpo/podcastlists/views.py b/mygpo/podcastlists/views.py index 0e9a760a..f8bc5328 100644 --- a/mygpo/podcastlists/views.py +++ b/mygpo/podcastlists/views.py @@ -12,7 +12,7 @@ from django.contrib.auth import get_user_model from django.contrib import messages from django.contrib.contenttypes.models import ContentType from django.utils.translation import ugettext as _ -from django.views.generic.base import View +from django.views import View from mygpo.podcasts.models import Podcast, PodcastGroup from mygpo.podcastlists.models import PodcastList, PodcastListEntry diff --git a/mygpo/pubsub/views.py b/mygpo/pubsub/views.py index bf063ed5..da003a8c 100644 --- a/mygpo/pubsub/views.py +++ b/mygpo/pubsub/views.py @@ -7,7 +7,7 @@ import logging from django.http import HttpResponseNotFound, HttpResponse -from django.views.generic.base import View +from django.views import View from django.views.decorators.csrf import csrf_exempt from mygpo.pubsub.models import HubSubscription diff --git a/mygpo/share/userpage.py b/mygpo/share/userpage.py index 9d45857d..3dea9869 100644 --- a/mygpo/share/userpage.py +++ b/mygpo/share/userpage.py @@ -1,7 +1,7 @@ from datetime import datetime, timedelta from django.shortcuts import render -from django.views.generic.base import View +from django.views import View from django.utils.decorators import method_decorator from django.contrib.sites.requests import RequestSite from django.contrib.auth import get_user_model diff --git a/mygpo/share/views.py b/mygpo/share/views.py index 5727ee6a..71c8f6b0 100644 --- a/mygpo/share/views.py +++ b/mygpo/share/views.py @@ -5,7 +5,7 @@ from django.contrib.sites.requests import RequestSite from django.contrib.auth.decorators import login_required from django.views.decorators.vary import vary_on_cookie from django.views.decorators.cache import cache_control -from django.views.generic.base import View +from django.views import View from django.utils.decorators import method_decorator from mygpo.podcasts.models import Podcast diff --git a/mygpo/users/views/registration.py b/mygpo/users/views/registration.py index 88c353f6..80d403d6 100644 --- a/mygpo/users/views/registration.py +++ b/mygpo/users/views/registration.py @@ -10,7 +10,7 @@ from django.utils.translation import ugettext as _ from django.template.loader import render_to_string from django.core.urlresolvers import reverse, reverse_lazy from django.views.generic import TemplateView -from django.views.generic.base import View +from django.views import View from django.contrib import messages from django.contrib.auth import get_user_model from django.contrib.sites.requests import RequestSite diff --git a/mygpo/users/views/user.py b/mygpo/users/views/user.py index 664c017f..dc9775e0 100644 --- a/mygpo/users/views/user.py +++ b/mygpo/users/views/user.py @@ -28,7 +28,8 @@ from django.conf import settings from django.utils.translation import ugettext as _ from django.views.decorators.cache import never_cache from django.template.loader import render_to_string -from django.views.generic.base import View, TemplateView +from django.views import View +from django.views.generic import TemplateView from django.utils.decorators import method_decorator from django.core.urlresolvers import reverse from django.utils.http import is_safe_url diff --git a/mygpo/web/logo.py b/mygpo/web/logo.py index 8c1e125b..f9bca957 100644 --- a/mygpo/web/logo.py +++ b/mygpo/web/logo.py @@ -28,7 +28,7 @@ from PIL import Image, ImageDraw from django.core.urlresolvers import reverse from django.conf import settings from django.http import Http404, HttpResponse, HttpResponseNotFound -from django.views.generic.base import View +from django.views import View from django.utils.decorators import method_decorator from django.views.decorators.http import last_modified diff --git a/mygpo/web/views.py b/mygpo/web/views.py index 2f5181cc..6d9e4094 100644 --- a/mygpo/web/views.py +++ b/mygpo/web/views.py @@ -26,7 +26,7 @@ from django.utils.translation import ugettext as _ from django.contrib.auth.decorators import login_required from django.shortcuts import render from django.contrib.sites.requests import RequestSite -from django.views.generic.base import View +from django.views import View from django.views.decorators.vary import vary_on_cookie from django.views.decorators.cache import never_cache, cache_control -- 2.11.4.GIT