Merge "Port parse_mime_headers() to Python 3"

openstack/swift

Code Issues Proposed changes

Browse Source

This commit is contained in:

Jenkins

2016年02月12日 15:11:14 +00:00

committed by Gerrit Code Review

parent a5bdb45757 d9b22ac51c

commit e2c570c0ab

2 changed files with 18 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

16
swift/common/utils.py

View File

@@ -3490,11 +3490,21 @@ def parse_mime_headers(doc_file):

headers = []

while True:

line = doc_file.readline()

done = line in (b'\r\n', b'\n', b'')

if six.PY3:

try:

line = line.decode('utf-8')

except UnicodeDecodeError:

line = line.decode('latin1')

headers.append(line)

if line in (b'\r\n', b'\n', b''):

if done:

break

header_string = b''.join(headers)

return HeaderKeyDict(email.parser.Parser().parsestr(header_string))

if six.PY3:

header_string = ''.join(headers)

else:

header_string = b''.join(headers)

headers = email.parser.Parser().parsestr(header_string)

return HeaderKeyDict(headers)

def mime_to_document_iters(input_file, boundary, read_chunk_size=4096):

7
test/unit/common/test_utils.py

View File

@@ -5148,6 +5148,10 @@ Utf-8: \xd0\xba\xd0\xbe\xd0\xbd\xd1\x82\xd0\xb5\xd0\xb9\xd0\xbd\xd0\xb5\xd1\x80

This is the body

""")

headers = utils.parse_mime_headers(doc_file)

utf8 = u'\u043a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440'

if six.PY2:

utf8 = utf8.encode('utf-8')

expected_headers = {

'Content-Disposition': 'form-data; name="file_size"',

'Foo': "Bar",

@@ -5157,8 +5161,7 @@ This is the body

'Connexion': "=?iso8859-1?q?r=E9initialis=E9e_par_l=27homologue?=",

'Status': "=?utf-8?b?5byA5aeL6YCa6L+H5a+56LGh5aSN5Yi2?=",

'Latin-1': "Resincronizaci\xf3n realizada con \xe9xito",

'Utf-8': ("\xd0\xba\xd0\xbe\xd0\xbd\xd1\x82\xd0\xb5\xd0\xb9\xd0"

"\xbd\xd0\xb5\xd1\x80")

'Utf-8': utf8,

}

self.assertEqual(expected_headers, headers)

self.assertEqual(b"This is the body\n", doc_file.read())