Remove validate_headers
It wasn't used anymore since moved up to requests (and it fails in py3). Change-Id: Ic8a80ae09ca6445696a9cf34ffb503c5ff51bc79
This commit is contained in:
@@ -32,7 +32,7 @@ from time import sleep, time
|
|||||||
import six
|
import six
|
||||||
|
|
||||||
from swiftclient import version as swiftclient_version
|
from swiftclient import version as swiftclient_version
|
||||||
from swiftclient.exceptions import ClientException, InvalidHeadersException
|
from swiftclient.exceptions import ClientException
|
||||||
from swiftclient.utils import LengthWrapper
|
from swiftclient.utils import LengthWrapper
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@@ -109,19 +109,6 @@ def quote(value, safe='/'):
|
|||||||
return value
|
return value
|
||||||
|
|
||||||
|
|
||||||
def validate_headers(headers):
|
|
||||||
if headers:
|
|
||||||
for key, raw_value in headers.items():
|
|
||||||
value = str(encode_utf8(raw_value))
|
|
||||||
|
|
||||||
if '\n' in value:
|
|
||||||
raise InvalidHeadersException("%r header contained a "
|
|
||||||
"newline" % key)
|
|
||||||
if '\r' in value:
|
|
||||||
raise InvalidHeadersException("%r header contained a "
|
|
||||||
"carriage return" % key)
|
|
||||||
|
|
||||||
|
|
||||||
def encode_utf8(value):
|
def encode_utf8(value):
|
||||||
if isinstance(value, six.text_type):
|
if isinstance(value, six.text_type):
|
||||||
value = value.encode('utf8')
|
value = value.encode('utf8')
|
||||||
|
@@ -66,7 +66,3 @@ class ClientException(Exception):
|
|||||||
b += ' [first 60 chars of response] %s' \
|
b += ' [first 60 chars of response] %s' \
|
||||||
% self.http_response_content[:60]
|
% self.http_response_content[:60]
|
||||||
return b and '%s: %s' % (a, b) or a
|
return b and '%s: %s' % (a, b) or a
|
||||||
|
|
||||||
|
|
||||||
class InvalidHeadersException(Exception):
|
|
||||||
pass
|
|
||||||
|
@@ -248,26 +248,6 @@ class TestHttpHelpers(MockHttpTest):
|
|||||||
ua = req_headers.get('user-agent', 'XXX-MISSING-XXX')
|
ua = req_headers.get('user-agent', 'XXX-MISSING-XXX')
|
||||||
self.assertEqual(ua, 'a-new-default')
|
self.assertEqual(ua, 'a-new-default')
|
||||||
|
|
||||||
def test_validate_headers(self):
|
|
||||||
headers = {'key': 'value'}
|
|
||||||
self.assertEqual(c.validate_headers(headers), None)
|
|
||||||
|
|
||||||
headers = {'key': 'value1\nvalue2'}
|
|
||||||
self.assertRaises(c.InvalidHeadersException, c.validate_headers,
|
|
||||||
headers)
|
|
||||||
|
|
||||||
headers = {'key': 'value1\rvalue2'}
|
|
||||||
self.assertRaises(c.InvalidHeadersException, c.validate_headers,
|
|
||||||
headers)
|
|
||||||
|
|
||||||
def test_validate_headers_with_other_than_str(self):
|
|
||||||
values = [None, 1, 1.0, u"A"]
|
|
||||||
if six.PY2:
|
|
||||||
values.append(long(1))
|
|
||||||
for t in values:
|
|
||||||
self.assertEqual(c.validate_headers({'key': t}),
|
|
||||||
None)
|
|
||||||
|
|
||||||
# TODO: following tests are placeholders, need more tests, better coverage
|
# TODO: following tests are placeholders, need more tests, better coverage
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user