D3884.1775237229.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D3884.1775237229.diff
View Options

	Index: pykolab/imap/cyrus.py
	===================================================================
	--- pykolab/imap/cyrus.py
	+++ pykolab/imap/cyrus.py
	@@ -30,6 +30,7 @@

	import pykolab

	+from pykolab import utils
	from pykolab import constants
	from pykolab.imap import IMAP
	from pykolab.translate import _
	@@ -208,7 +209,6 @@
	_mailfolder['domain'])
	)

	-
	# TODO: Murder capabilities may have been suppressed using Cyrus IMAP
	# configuration.
	if not self.murder:
	@@ -569,11 +569,11 @@

	if ' ' in verify_folder_search:
	folders = self.lm(
	- '"%s"' % self.folder_utf7(verify_folder_search)
	+ '%s' % utils.ensure_str(self.folder_utf7(verify_folder_search))
	)

	else:
	- folders = self.lm(self.folder_utf7(verify_folder_search))
	+ folders = self.lm(utils.ensure_str(self.folder_utf7(verify_folder_search)))

	# NOTE: Case also covered is valid hexadecimal folders; won't be
	# the actual check as intended, but doesn't give you anyone else's