68dba16b26
Changes since 6.5.3.1: - Bump bundled imaplib2 library 2.29 --> 2.33 - Actually perform the SSL fingerprint check (reported by J. Cook) - Curses UI, don't use colors after we shut down curses already (C.H"oger) - Document that '%' needs encoding as '%%' in *.conf - Fix crash when IMAP.quickchanged() led to an Error (reported by sharat87) - Implement the createfolders setting to disable folder propagation (see docs) Changes since 6.5.3: - Don't fail if no dry-run setting exists in offlineimap.conf (introduced in 6.5.3) Changes since 6.5.2.1: - --dry-run mode protects us from performing any actual action. It will not precisely give the exact information what will happen. If e.g. it would need to create a folder, it merely outputs "Would create folder X", but not how many and which mails it would transfer. - Internal code changes to prepare for Python3 - Improve user documentation of nametrans/folderfilter - Fixed some cases where invalid nametrans rules were not caught and we would not propagate local folders to the remote repository. (now tested in test03) - Revert "* Slight performance enhancement uploading mails to an IMAP server in the common case." It might have led to instabilities. - Revamped documentation structure. make in the docs dir or make doc in the root dir will now create the 1) man page and 2) the user documentation using sphinx (requiring python-doctools, and sphinx). The resulting user docs are in docs/html. You can also only create the man pages with make man in the docs dir. - -f command line option only works on the untranslated remote repository folder names now. Previously folderfilters had to match both the local AND remote name which caused unwanted behavior in combination with nametrans rules. Clarify in the help text. - Some better output when using nonsensical configuration settings
62 lines
2.4 KiB
Text
62 lines
2.4 KiB
Text
From 8cf576b9edd7f7fe245d4590206ff740d3ed31e3 Mon Sep 17 00:00:00 2001
|
|
From: Eygene Ryabinkin <rea@codelabs.ru>
|
|
Date: Wed, 6 Jun 2012 07:45:01 +0400
|
|
Subject: [PATCH] Use '%' instead of String.format()
|
|
|
|
Python 2.6 doesn't like empty {} specifications for
|
|
String.format(), but the ones that were changed don't
|
|
really need the full machinery of String.format() here.
|
|
|
|
Signed-off-by: Eygene Ryabinkin <rea@codelabs.ru>
|
|
---
|
|
offlineimap/folder/Base.py | 2 +-
|
|
offlineimap/ui/UIBase.py | 6 +++---
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/offlineimap/folder/Base.py b/offlineimap/folder/Base.py
|
|
index 6f6f364..4c3f1ca 100644
|
|
--- a/offlineimap/folder/Base.py
|
|
+++ b/offlineimap/folder/Base.py
|
|
@@ -386,7 +386,7 @@ class BaseFolder(object):
|
|
self.getmessageuidlist())
|
|
num_to_copy = len(copylist)
|
|
if num_to_copy and self.repository.account.dryrun:
|
|
- self.ui.info("[DRYRUN] Copy {} messages from {}[{}] to {}".format(
|
|
+ self.ui.info("[DRYRUN] Copy %d messages from %s[%s] to %s" % (
|
|
num_to_copy, self, self.repository, dstfolder.repository))
|
|
return
|
|
for num, uid in enumerate(copylist):
|
|
diff --git a/offlineimap/ui/UIBase.py b/offlineimap/ui/UIBase.py
|
|
index eea929d..6608d6d 100644
|
|
--- a/offlineimap/ui/UIBase.py
|
|
+++ b/offlineimap/ui/UIBase.py
|
|
@@ -301,7 +301,7 @@ class UIBase(object):
|
|
def makefolder(self, repo, foldername):
|
|
"""Called when a folder is created"""
|
|
prefix = "[DRYRUN] " if self.dryrun else ""
|
|
- self.info("{}Creating folder {}[{}]".format(
|
|
+ self.info("%sCreating folder %s[%s]" % (
|
|
prefix, foldername, repo))
|
|
|
|
def syncingfolder(self, srcrepos, srcfolder, destrepos, destfolder):
|
|
@@ -346,7 +346,7 @@ class UIBase(object):
|
|
def deletingmessages(self, uidlist, destlist):
|
|
ds = self.folderlist(destlist)
|
|
prefix = "[DRYRUN] " if self.dryrun else ""
|
|
- self.info("{}Deleting {} messages ({}) in {}".format(
|
|
+ self.info("%sDeleting %s messages (%s) in %s" % (
|
|
prefix, len(uidlist),
|
|
offlineimap.imaputil.uid_sequence(uidlist), ds))
|
|
|
|
@@ -474,7 +474,7 @@ class UIBase(object):
|
|
|
|
def callhook(self, msg):
|
|
if self.dryrun:
|
|
- self.info("[DRYRUN] {}".format(msg))
|
|
+ self.info("[DRYRUN] %s" % (msg))
|
|
else:
|
|
self.info(msg)
|
|
|
|
--
|
|
1.7.10.3
|
|
|