Fix str.format() calls for Python 2.6.

Python 2.6 requires a slightly different string formatting that >2.7.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>

Changelog.rst

@@ -8,6 +8,8 @@ ChangeLog
 WIP (add new stuff for the next release)
 ========================================
 
+* Fix str.format() calls for Python 2.6 (D. Logie)
+
 OfflineIMAP v6.5.4 (2012-06-02)
 =================================
 

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 {0} messages from {1}[{2}] to {3}".format(
                     num_to_copy, self, self.repository, dstfolder.repository))
             return
         for num, uid in enumerate(copylist):

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("{0}Creating folder {1}[{2}]".format(
                 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("{0}Deleting {1} messages ({2}) in {3}".format(
                 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] {0}".format(msg))
         else:
             self.info(msg)
 

test/OLItest/TestRunner.py

@@ -127,7 +127,7 @@ class OLITestLib():
         reponame: All on `reponame` or all IMAP-type repositories if None"""
         config = cls.get_default_config()
         if reponame:
-            sections = ['Repository {}'.format(reponame)]
+            sections = ['Repository {0}'.format(reponame)]
         else:
             sections = [r for r in config.sections() \
                             if r.startswith('Repository')]
@@ -162,8 +162,8 @@ class OLITestLib():
             dirs = [d for d in dirs if d.startswith(b'INBOX.OLItest')]
             for folder in dirs:
                 res_t, data = imapobj.delete(b'\"'+folder+b'\"')
-                assert res_t == 'OK', "Folder deletion of {} failed with error"\
+                assert res_t == 'OK', "Folder deletion of {0} failed with error"\
-                    ":\n{} {}".format(folder.decode('utf-8'), res_t, data)
+                    ":\n{1} {2}".format(folder.decode('utf-8'), res_t, data)
             imapobj.logout()
 
     @classmethod
@@ -197,7 +197,7 @@ class OLITestLib():
         Use some default content if not given"""
         assert cls.testdir != None
         while True:  # Loop till we found a unique filename
-            mailfile = '{}:2,'.format(random.randint(0,999999999))
+            mailfile = '{0}:2,'.format(random.randint(0,999999999))
             mailfilepath = os.path.join(cls.testdir, 'mail',
                                         folder, 'new', mailfile)
             if not os.path.isfile(mailfilepath):

test/tests/test_01_basic.py

@@ -67,7 +67,7 @@ class TestBasicFunctions(unittest.TestCase):
         self.assertEqual(res, "")
         boxes, mails = OLITestLib.count_maildir_mails('')
         self.assertTrue((boxes, mails)==(0,0), msg="Expected 0 folders and 0 "
-            "mails, but sync led to {} folders and {} mails".format(
+            "mails, but sync led to {0} folders and {1} mails".format(
                 boxes, mails))
 
     def test_02_createdir(self):
@@ -82,7 +82,7 @@ class TestBasicFunctions(unittest.TestCase):
         self.assertEqual(res, "")
         boxes, mails = OLITestLib.count_maildir_mails('')
         self.assertTrue((boxes, mails)==(2,0), msg="Expected 2 folders and 0 "
-            "mails, but sync led to {} folders and {} mails".format(
+            "mails, but sync led to {0} folders and {1} mails".format(
                 boxes, mails))
 
     def test_03_nametransmismatch(self):
@@ -101,7 +101,7 @@ class TestBasicFunctions(unittest.TestCase):
         mismatch = "ERROR: INFINITE FOLDER CREATION DETECTED!" in res
         self.assertEqual(mismatch, True, msg="Mismatching nametrans rules did "
             "NOT trigger an 'infinite folder generation' error. Output was:\n"
-             "{}".format(res))
+             "{0}".format(res))
         # Write out default config file again
         OLITestLib.write_config_file()
 
@@ -121,12 +121,12 @@ class TestBasicFunctions(unittest.TestCase):
         self.assertEqual(res, "")
         boxes, mails = OLITestLib.count_maildir_mails('')
         self.assertTrue((boxes, mails)==(1,1), msg="Expected 1 folders and 1 "
-            "mails, but sync led to {} folders and {} mails".format(
+            "mails, but sync led to {0} folders and {1} mails".format(
                 boxes, mails))
         # The local Mail should have been assigned a proper UID now, check!
         uids = OLITestLib.get_maildir_uids('INBOX.OLItest')
         self.assertFalse (None in uids, msg = "All mails should have been "+ \
-            "assigned the IMAP's UID number, but {} messages had no valid ID "\
+            "assigned the IMAP's UID number, but {0} messages had no valid ID "\
             .format(len([None for x in uids if x==None])))
 
     def test_05_createfolders(self):