From e373f00088b2b65004798b78a945cb1a31936873 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Thu, 16 Oct 2014 21:07:52 +0200
Subject: [PATCH] Python 2.6 compat.

see #585
---
 modoboa/core/tests.py                                   | 8 ++++----
 modoboa/extensions/admin/templatetags/admin_tags.py     | 2 +-
 modoboa/extensions/limits/tests.py                      | 2 +-
 modoboa/extensions/webmail/templatetags/webmail_tags.py | 9 +++++----
 modoboa/extensions/webmail/views.py                     | 4 ++--
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/modoboa/core/tests.py b/modoboa/core/tests.py
index 7f2e1ac88..56ed41f2e 100644
--- a/modoboa/core/tests.py
+++ b/modoboa/core/tests.py
@@ -67,21 +67,21 @@ class ModoboaAdminCommandTestCase(TestCase):
         self.workdir = tempfile.mkdtemp()
 
     def tearDown(self):
-        exec_cmd("rm -rf {}".format(self.workdir))
+        exec_cmd("rm -rf {0}".format(self.workdir))
 
     def _test_maps_generation(self, engine, categories=None):
         if categories is None:
             categories = ["std", "autoreply", "relaydomains"]
-        dburl = "{}://user:password@localhost/testdb".format(engine)
+        dburl = "{0}://user:password@localhost/testdb".format(engine)
         code, output = exec_cmd(
-            "modoboa-admin.py postfix_maps --categories {} --dburl {} {}".format(
+            "modoboa-admin.py postfix_maps --categories {0} --dburl {1} {2}".format(
                 " ".join(categories), dburl, self.workdir
             )
         )
         self.assertEqual(code, 0)
         for category in categories:
             for mapfile in self.MAP_FILES[category]:
-                path = "{}/{}".format(self.workdir, mapfile)
+                path = "{0}/{1}".format(self.workdir, mapfile)
                 self.assertTrue(os.path.exists(path))
                 with open(path) as fpo:
                     content = fpo.read()
diff --git a/modoboa/extensions/admin/templatetags/admin_tags.py b/modoboa/extensions/admin/templatetags/admin_tags.py
index d79e04817..dd4482268 100644
--- a/modoboa/extensions/admin/templatetags/admin_tags.py
+++ b/modoboa/extensions/admin/templatetags/admin_tags.py
@@ -236,7 +236,7 @@ def identity_modify_link(identity, active_tab='default'):
 def domadmin_actions(daid, domid):
     actions = [{
         "name": "removeperm",
-        "url": "{}?domid={}&daid={}".format(
+        "url": "{0}?domid={1}&daid={2}".format(
             reverse("admin:permission_remove"), domid, daid),
         "img": "fa fa-trash",
         "title": _("Remove this permission")
diff --git a/modoboa/extensions/limits/tests.py b/modoboa/extensions/limits/tests.py
index 15813587c..4db5078df 100644
--- a/modoboa/extensions/limits/tests.py
+++ b/modoboa/extensions/limits/tests.py
@@ -270,7 +270,7 @@ class ResellerTestCase(ResourceTestCase):
         self.clt.logout()
         self.clt.login(username='admin', password='password')
         self.ajax_get(
-            "{}?domid={}&daid={}".format(
+            "{0}?domid={1}&daid={2}".format(
                 reverse('admin:permission_remove'), dom.id, self.user.id
             ), {}
         )
diff --git a/modoboa/extensions/webmail/templatetags/webmail_tags.py b/modoboa/extensions/webmail/templatetags/webmail_tags.py
index 576fe7d04..2bf34d190 100644
--- a/modoboa/extensions/webmail/templatetags/webmail_tags.py
+++ b/modoboa/extensions/webmail/templatetags/webmail_tags.py
@@ -40,7 +40,7 @@ def viewmail_menu(selection, folder, user, mail_id=None):
         {"name": "delete",
          "img": "fa fa-trash",
          "class": "btn-danger",
-         "url": "{}?mbox={}&selection[]={}".format(
+         "url": "{0}?mbox={1}&selection[]={2}".format(
              reverse("webmail:mail_delete"), folder, mail_id),
          "title": _("Delete")
         },
@@ -100,11 +100,11 @@ def listmailbox_menu(selection, folder, user):
          "menu": [
              {"name": "mark-read",
               "label": _("Mark as read"),
-              "url": "{}?status=read".format(
+              "url": "{0}?status=read".format(
                   reverse("webmail:mail_mark", args=[folder]))},
              {"name": "mark-unread",
               "label": _("Mark as unread"),
-              "url": "{}?status=unread".format(
+              "url": "{0}?status=unread".format(
                   reverse("webmail:mail_mark", args=[folder]))},
          ]
          },
@@ -114,7 +114,8 @@ def listmailbox_menu(selection, folder, user):
         entries[1]["menu"] += [
             {"name": "empty",
              "label": _("Empty folder"),
-             "url": "{}?name={}".format(reverse("webmail:trash_empty"), folder)}
+             "url": "{0}?name={1}".format(
+                 reverse("webmail:trash_empty"), folder)}
         ]
     return render_to_string('webmail/main_action_bar.html', {
         'selection': selection, 'entries': entries, 'user': user, 'css': "nav",
diff --git a/modoboa/extensions/webmail/views.py b/modoboa/extensions/webmail/views.py
index 96e0710e0..7a8993190 100644
--- a/modoboa/extensions/webmail/views.py
+++ b/modoboa/extensions/webmail/views.py
@@ -368,7 +368,7 @@ def listmailbox(request, defmailbox="INBOX", update_session=True):
         length = len(content)
     else:
         if page_id == 1:
-            content = "<div class='alert alert-info'>{}</div>".format(
+            content = "<div class='alert alert-info'>{0}</div>".format(
                 _("Empty mailbox")
             )
         length = 0
@@ -506,7 +506,7 @@ def viewmail(request):
     else:
         links = int(links)
 
-    url = "{}?mbox={}&mailid={}&links={}".format(
+    url = "{0}?mbox={1}&mailid={2}&links={3}".format(
         reverse("webmail:mailcontent_get"), mbox, mailid, links)
     content = Template("""
 <iframe src="{{ url }}" id="mailcontent"></iframe>