openstack
/
ec2-api
Code Issues Proposed changes

py34: fix text conversion and urlparse usage in metadata 

Change-Id: I89a3198955a585d601a3d2510c0af3f00eaed2cd
This commit is contained in:
Andrey Pavlov 2015-09-09 18:14:30 +03:00
parent d210e7a69f
commit 0ff52b760e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ec2api/metadata/__init__.py
View File

@ -15,12 +15,12 @@
import hashlib
import hmac
import posixpath
import urlparse
import httplib2
from oslo_config import cfg
from oslo_log import log as logging
import six
import six.moves.urllib.parse as urlparse
import webob
from ec2api import context as ec2_context
@ -100,7 +100,8 @@ class MetadataRequestHandler(wsgi.Application):
LOG.exception(_LE("Unexpected error."))
msg = _('An unknown error has occurred. '
'Please try your request again.')
return webob.exc.HTTPInternalServerError(explanation=unicode(msg))
return webob.exc.HTTPInternalServerError(
explanation=six.text_type(msg))
def _proxy_request(self, req, requester):
headers = self._build_proxy_request_headers(requester)
@ -148,7 +149,8 @@ class MetadataRequestHandler(wsgi.Application):
'Remote metadata server experienced an internal server error.'
)
LOG.warn(msg)
return webob.exc.HTTPInternalServerError(explanation=unicode(msg))
return webob.exc.HTTPInternalServerError(
explanation=six.text_type(msg))
else:
raise Exception(_('Unexpected response code: %s') % resp.status)