IMAP.py: fixed cannot concatenate 'str' and 'list' in assert
r[1] is a list. In case it contains more than one 'str' they are concatenated using '. '. In processmessagesflags the join is tested, for savemessagesflags I assume that it is also needed.
This commit is contained in:
		| @@ -271,7 +271,7 @@ class IMAPFolder(BaseFolder): | |||||||
|                 return |                 return | ||||||
|             result = imapobj.uid('store', '%d' % uid, 'FLAGS', |             result = imapobj.uid('store', '%d' % uid, 'FLAGS', | ||||||
|                                  imaputil.flagsmaildir2imap(flags)) |                                  imaputil.flagsmaildir2imap(flags)) | ||||||
|             assert result[0] == 'OK', 'Error with store: ' + r[1] |             assert result[0] == 'OK', 'Error with store: ' + '. '.join(r[1]) | ||||||
|         finally: |         finally: | ||||||
|             self.imapserver.releaseconnection(imapobj) |             self.imapserver.releaseconnection(imapobj) | ||||||
|         result = result[1][0] |         result = result[1][0] | ||||||
| @@ -317,7 +317,7 @@ class IMAPFolder(BaseFolder): | |||||||
|                             imaputil.listjoin(uidlist), |                             imaputil.listjoin(uidlist), | ||||||
|                             operation + 'FLAGS', |                             operation + 'FLAGS', | ||||||
|                             imaputil.flagsmaildir2imap(flags)) |                             imaputil.flagsmaildir2imap(flags)) | ||||||
|             assert r[0] == 'OK', 'Error with store: ' + r[1] |             assert r[0] == 'OK', 'Error with store: ' + '. '.join(r[1]) | ||||||
|             r = r[1] |             r = r[1] | ||||||
|         finally: |         finally: | ||||||
|             self.imapserver.releaseconnection(imapobj) |             self.imapserver.releaseconnection(imapobj) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Florian Friesdorf
					Florian Friesdorf