Mercurial > hg > orthanc-tests

comparison Plugins/DicomWeb/DicomWeb.py @ 226:230aede7f8d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test_bitbucket_issue_96
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 26 Feb 2019 20:32:31 +0100
parents 0f03ee6ffa80
children 943166deebcb
comparison
equal deleted inserted replaced
225:4d5af1f49cb2 226:230aede7f8d5
73 73
74 header = '' 74 header = ''
75 for i in answer[0]: 75 for i in answer[0]:
76 header += '%s: %s\r\n' % (i, answer[0][i]) 76 header += '%s: %s\r\n' % (i, answer[0][i])
77 77
78 msg = email.message_from_string(header + '\r\n' + answer[1]) 78 b = bytearray()
79 b.extend(header.encode('ascii'))
80 b.extend(b'\r\n')
81 b.extend(answer[1])
82
83 if (sys.version_info >= (3, 0)):
84 msg = email.message_from_bytes(b)
85 else:
86 msg = email.message_from_string(b)
87
79 if not msg.is_multipart(): 88 if not msg.is_multipart():
80 raise Exception('Not a multipart message') 89 raise Exception('Not a multipart message')
81 90
82 result = [] 91 result = []
83 92
84 for part in msg.walk(): 93 for part in msg.walk():
85 payload = part.get_payload(decode=True) 94 payload = part.get_payload(decode = True)
86 if payload != None: 95 if payload != None:
87 result.append(payload) 96 result.append(payload)
88 97
89 return result 98 return result