1.1 --- a/MoinMessage.py Sun Jan 12 19:39:47 2014 +0100
1.2 +++ b/MoinMessage.py Mon Jan 13 00:18:40 2014 +0100
1.3 @@ -115,7 +115,7 @@
1.4 part.attach(alternative)
1.5 return part
1.6
1.7 - def get_payload(self, timestamped=True):
1.8 + def get_payload(self, subtype="mixed", timestamped=True):
1.9
1.10 """
1.11 Get the multipart payload for the message. If the 'timestamped'
1.12 @@ -128,7 +128,7 @@
1.13 if len(self.updates) == 1:
1.14 message = self.updates[0]
1.15 else:
1.16 - message = MIMEMultipart()
1.17 + message = MIMEMultipart(subtype)
1.18 message.add_header("Update-Type", "collection")
1.19 for update in self.updates:
1.20 message.attach(update)
1.21 @@ -328,6 +328,14 @@
1.22
1.23 return encrypted_message
1.24
1.25 + def importKeys(self, text):
1.26 +
1.27 + """
1.28 + Import the keys provided by the given 'text'.
1.29 + """
1.30 +
1.31 + self.run(["--import"], text)
1.32 +
1.33 def exportKey(self, keyid):
1.34
1.35 """