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

test_bitbucket_issue_96
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 26 Feb 2019 20:32:31 +0100
parents 0f03ee6ffa80
children 943166deebcb
line wrap: on
line diff
--- a/Plugins/DicomWeb/DicomWeb.py	Tue Feb 26 18:30:31 2019 +0100
+++ b/Plugins/DicomWeb/DicomWeb.py	Tue Feb 26 20:32:31 2019 +0100
@@ -75,14 +75,23 @@
     for i in answer[0]:
         header += '%s: %s\r\n' % (i, answer[0][i])
 
-    msg = email.message_from_string(header + '\r\n' + answer[1])
+    b = bytearray()
+    b.extend(header.encode('ascii'))
+    b.extend(b'\r\n')
+    b.extend(answer[1])
+        
+    if (sys.version_info >= (3, 0)):
+        msg = email.message_from_bytes(b)
+    else:
+        msg = email.message_from_string(b)
+        
     if not msg.is_multipart():
         raise Exception('Not a multipart message')
     
     result = []
 
     for part in msg.walk():
-        payload = part.get_payload(decode=True)
+        payload = part.get_payload(decode = True)
         if payload != None:
             result.append(payload)