wcsinstd: make sure wcs do not get unicode strings
This commit is contained in:
parent
f6f676d5b2
commit
fe3806c9f7
|
@ -33,7 +33,7 @@ class DeployInstance(object):
|
||||||
self.skel_dir = os.path.join(settings.MEDIA_ROOT, 'skeletons', self.skeleton)
|
self.skel_dir = os.path.join(settings.MEDIA_ROOT, 'skeletons', self.skeleton)
|
||||||
|
|
||||||
url_template = app_settings.URL_TEMPLATE
|
url_template = app_settings.URL_TEMPLATE
|
||||||
self.url = url_template % {'domain': self.domain}
|
self.url = str(url_template % {'domain': self.domain})
|
||||||
|
|
||||||
host, path = urlparse(self.url)[1:3]
|
host, path = urlparse(self.url)[1:3]
|
||||||
if path.endswith('/'):
|
if path.endswith('/'):
|
||||||
|
@ -181,7 +181,7 @@ class DeployInstance(object):
|
||||||
wcs_cfg['sp'] = {
|
wcs_cfg['sp'] = {
|
||||||
'common_domain': None,
|
'common_domain': None,
|
||||||
'common_domain_getter_url': None,
|
'common_domain_getter_url': None,
|
||||||
'organization_name': '%s' % self.title,
|
'organization_name': self.title.encode('utf-8'),
|
||||||
'privatekey': 'private-key.pem',
|
'privatekey': 'private-key.pem',
|
||||||
'publickey': 'public-key.pem'}
|
'publickey': 'public-key.pem'}
|
||||||
wcs_cfg['sp'].update(service_provider_configuration)
|
wcs_cfg['sp'].update(service_provider_configuration)
|
||||||
|
|
Reference in New Issue