Merge "py3:Remove six.iterXXX"
This commit is contained in:
commit
2a01616a45
@ -33,7 +33,6 @@ from django.utils import timezone
|
|||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from openstack_auth import views as auth_views
|
from openstack_auth import views as auth_views
|
||||||
import six
|
|
||||||
|
|
||||||
from horizon import exceptions
|
from horizon import exceptions
|
||||||
from horizon.utils import functions as utils
|
from horizon.utils import functions as utils
|
||||||
@ -89,7 +88,7 @@ class HorizonMiddleware(object):
|
|||||||
if max_cookie_size is not None and session_key is not None:
|
if max_cookie_size is not None and session_key is not None:
|
||||||
cookie_size = sum((
|
cookie_size = sum((
|
||||||
len(key) + len(value)
|
len(key) + len(value)
|
||||||
for key, value in six.iteritems(request.COOKIES)
|
for key, value in request.COOKIES.items()
|
||||||
))
|
))
|
||||||
if cookie_size >= max_cookie_size:
|
if cookie_size >= max_cookie_size:
|
||||||
LOG.error(
|
LOG.error(
|
||||||
@ -180,9 +179,9 @@ class HorizonMiddleware(object):
|
|||||||
cookie_keys = set(('max_age', 'expires', 'path', 'domain',
|
cookie_keys = set(('max_age', 'expires', 'path', 'domain',
|
||||||
'secure', 'httponly', 'logout_reason'))
|
'secure', 'httponly', 'logout_reason'))
|
||||||
# Copy cookies from HttpResponseRedirect towards HttpResponse
|
# Copy cookies from HttpResponseRedirect towards HttpResponse
|
||||||
for cookie_name, cookie in six.iteritems(response.cookies):
|
for cookie_name, cookie in response.cookies.items():
|
||||||
cookie_kwargs = dict((
|
cookie_kwargs = dict((
|
||||||
(key, value) for key, value in six.iteritems(cookie)
|
(key, value) for key, value in cookie.items()
|
||||||
if key in cookie_keys and value
|
if key in cookie_keys and value
|
||||||
))
|
))
|
||||||
redirect_response.set_cookie(
|
redirect_response.set_cookie(
|
||||||
|
@ -157,7 +157,7 @@ class WorkflowView(hz_views.ModalBackdropMixin, generic.TemplateView):
|
|||||||
if not step.action.is_valid():
|
if not step.action.is_valid():
|
||||||
errors[step.slug] = dict(
|
errors[step.slug] = dict(
|
||||||
(field, [six.text_type(error) for error in errors])
|
(field, [six.text_type(error) for error in errors])
|
||||||
for (field, errors) in six.iteritems(step.action.errors))
|
for (field, errors) in step.action.errors.items())
|
||||||
return {
|
return {
|
||||||
'has_errors': bool(errors),
|
'has_errors': bool(errors),
|
||||||
'workflow_slug': workflow.slug,
|
'workflow_slug': workflow.slug,
|
||||||
|
Loading…
Reference in New Issue
Block a user