From 673f501fc915ce0ab47bac2e1e626956c4ac3dc4 Mon Sep 17 00:00:00 2001 From: zhurong Date: Mon, 11 Mar 2019 13:59:04 +0800 Subject: [PATCH] Using six to fix python2/3 compatible Change-Id: I405284808be78082e96d077ba11a59534affba12 --- muranodashboard/catalog/views.py | 2 +- muranodashboard/environments/tables.py | 3 ++- muranodashboard/packages/views.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/muranodashboard/catalog/views.py b/muranodashboard/catalog/views.py index cd7b02edd..d700e0bb3 100644 --- a/muranodashboard/catalog/views.py +++ b/muranodashboard/catalog/views.py @@ -407,7 +407,7 @@ class Wizard(generic_views.PageTitleMixin, views.ModalFormMixin, LazyWizard): messages.success(self.request, message) if do_redirect: - return http.HttpResponseRedirect(bytes(env_url)) + return http.HttpResponseRedirect(six.text_type(env_url)) else: srv_id = getattr(srv, '?')['id'] return self.create_hacked_response( diff --git a/muranodashboard/environments/tables.py b/muranodashboard/environments/tables.py index 9e2b3e7f1..30262495d 100644 --- a/muranodashboard/environments/tables.py +++ b/muranodashboard/environments/tables.py @@ -29,6 +29,7 @@ from horizon.utils import filters from muranoclient.common import exceptions as exc from openstack_dashboard import policy from oslo_log import log as logging +import six from muranodashboard import api as api_utils from muranodashboard.api import packages as pkg_api @@ -379,7 +380,7 @@ class DeployThisEnvironment(tables.Action): redirect=reverse('horizon:app-catalog:environments:index')) redirect_to = reverse('horizon:app-catalog:environments:services', args=(environment_id,)) - return django_http.HttpResponseRedirect(bytes(redirect_to)) + return django_http.HttpResponseRedirect(six.text_type(redirect_to)) class ShowEnvironmentServices(tables.LinkAction): diff --git a/muranodashboard/packages/views.py b/muranodashboard/packages/views.py index 04dca2270..273829e92 100644 --- a/muranodashboard/packages/views.py +++ b/muranodashboard/packages/views.py @@ -309,7 +309,7 @@ class ImportBundleWizard(horizon_views.PageTitleMixin, views.ModalFormMixin, msg = _('Bundle successfully imported.') LOG.info(msg) messages.success(self.request, msg) - return http.HttpResponseRedirect(bytes(redirect)) + return http.HttpResponseRedirect(six.text_type(redirect)) class ImportPackageWizard(horizon_views.PageTitleMixin, views.ModalFormMixin, @@ -408,7 +408,7 @@ class ImportPackageWizard(horizon_views.PageTitleMixin, views.ModalFormMixin, msg = _('Package parameters successfully updated.') LOG.info(msg) messages.success(self.request, msg) - return http.HttpResponseRedirect(bytes(redirect)) + return http.HttpResponseRedirect(six.text_type(redirect)) def _handle_exception(self, original_e): exc_info = sys.exc_info()