55cb4f4473
Currently glanceclient doesn't support non-ASCII characters for images
names and properties (names and values as well). This patch introduces 2
functions (utils.py) that will help encoding and decoding strings in a
more "secure" way.
About the ensure_(str|unicode) functions:
They both try to use first the encoding used in stdin (or python's
default encoding if that's None) and fallback to utf-8 if those
encodings fail to decode a given text.
About the changes in glanceclient:
The major change is that all inputs will be decoded and will kept as
such inside the client's functions and will then be encoded before
being printed / sent out the client.
There are other small changes, all related to encoding to str,
around in order to avoid fails during some conversions. i.e: quoting
url encoded parameters.
Fixes bug: 1061150
Change-Id: I5c3ea93a716edfe284d19f6291d4e36028f91eb2
66 lines
2.1 KiB
Python
66 lines
2.1 KiB
Python
# Copyright 2012 OpenStack LLC.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import copy
|
|
import StringIO
|
|
|
|
from glanceclient.common import http
|
|
|
|
|
|
class FakeAPI(object):
|
|
def __init__(self, fixtures):
|
|
self.fixtures = fixtures
|
|
self.calls = []
|
|
|
|
def _request(self, method, url, headers=None, body=None):
|
|
call = (method, url, headers or {}, body)
|
|
self.calls.append(call)
|
|
return self.fixtures[url][method]
|
|
|
|
def raw_request(self, *args, **kwargs):
|
|
fixture = self._request(*args, **kwargs)
|
|
body_iter = http.ResponseBodyIterator(StringIO.StringIO(fixture[1]))
|
|
return FakeResponse(fixture[0]), body_iter
|
|
|
|
def json_request(self, *args, **kwargs):
|
|
fixture = self._request(*args, **kwargs)
|
|
return FakeResponse(fixture[0]), fixture[1]
|
|
|
|
|
|
class FakeResponse(object):
|
|
def __init__(self, headers, body=None,
|
|
version=1.0, status=200, reason="Ok"):
|
|
"""
|
|
:param headers: dict representing HTTP response headers
|
|
:param body: file-like object
|
|
:param version: HTTP Version
|
|
:param status: Response status code
|
|
:param reason: Status code related message.
|
|
"""
|
|
self.body = body
|
|
self.status = status
|
|
self.reason = reason
|
|
self.version = version
|
|
self.headers = headers
|
|
|
|
def getheaders(self):
|
|
return copy.deepcopy(self.headers).items()
|
|
|
|
def getheader(self, key, default):
|
|
return self.headers.get(key, default)
|
|
|
|
def read(self, amt):
|
|
return self.body.read(amt)
|