~roadmr/canonical-identity-provider/fix-deprecation-warnings-1

Viewing changes to src/webui/decorators.py

Committer: Ubuntu One Auto Copilot
Author(s): Tom Wardill
Date: 2018-02-26 10:27:50 UTC
mfrom: (1597.1.68 canonical-identity-provider)
Revision ID: otto-copilot@canonical.com-20180226102750-i14x4w85e1stu1su

Update to django 1.11.

Merged from https://code.launchpad.net/~tom-howrandom/canonical-identity-provider/django-1.11/+merge/338452

files added:
src/ubuntu_sso_saml/tests/urls_deeplink.py

src/ubuntu_sso_saml/tests/urls_deeplink_custom.py

src/ubuntu_sso_saml/tests/urls_deeplinking_fallback.py

files modified:
Makefile

config-manager.txt

dependencies.txt

django_project/settings_base.py

django_project/settings_devel.py

django_project/settings_test.py

django_project/urls.py

requirements.txt

scripts/generate-random-accounts

src/api/urls.py

src/api/v10/handlers.py

src/api/v20/tests/test_decorators.py

src/api/v20/tests/test_handlers.py

src/api/v20/tests/test_login.py

src/api/v20/urls.py

src/identityprovider/admin.py

src/identityprovider/auth.py

src/identityprovider/context_processors.py

src/identityprovider/emailutils.py

src/identityprovider/forms.py

src/identityprovider/models/account.py

src/identityprovider/models/api.py

src/identityprovider/models/emailaddress.py

src/identityprovider/routers.py

src/identityprovider/tests/factory.py

src/identityprovider/tests/helpers.py

src/identityprovider/tests/openid_server/per_version/test_sso_workflow_reset_password.py

src/identityprovider/tests/openid_server/test_basics.py

src/identityprovider/tests/openid_server/test_max_auth_age.py

src/identityprovider/tests/openid_server/test_pre_authorization.py

src/identityprovider/tests/test_admin.py

src/identityprovider/tests/test_apiutils.py

src/identityprovider/tests/test_auth.py

src/identityprovider/tests/test_backend_nop_base.py

src/identityprovider/tests/test_fields.py

src/identityprovider/tests/test_forms.py

src/identityprovider/tests/test_middleware.py

src/identityprovider/tests/test_models_account.py

src/identityprovider/tests/test_models_api.py

src/identityprovider/tests/test_models_emailaddress.py

src/identityprovider/tests/test_routers.py

src/identityprovider/tests/test_views_server.py

src/identityprovider/tests/test_widgets.py

src/identityprovider/tests/utils.py

src/identityprovider/urls.py

src/identityprovider/widgets.py

src/mockservice/sso_mockserver/mockserver.py

src/testing/runner.py

src/ubuntu_sso_saml/tests/test_processors.py

src/ubuntu_sso_saml/urls.py

src/ubuntu_sso_saml/views.py

src/webui/decorators.py

src/webui/tests/test_views_account.py

src/webui/tests/test_views_account_ssh.py

src/webui/tests/test_views_registration.py

src/webui/tests/test_views_ui.py

src/webui/urls.py

src/webui/views/errors.py

src/webui/views/registration.py

Show diffs side-by-side

added added

removed removed

src/webui/decorators.py

HttpResponseForbidden,

HttpResponseRedirect,

)

from django.template import RequestContext

from django.template.loader import render_to_string

from django.template.response import TemplateResponse

from django.utils.decorators import available_attrs

156

155

html = render_to_string(

157

156

'readonly.html',

158

157

{'readonly': False},

159

context_instance=RequestContext(request)

158

request=request

160

159

)

161

160

return HttpResponseForbidden(html)

162

161

return func(request, *args, **kwargs)

Older »