From f757ec2273b2d29d344f93cfeb5d8e5d6a7a796a Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Tue, 3 Feb 2015 09:08:41 +0100
Subject: [PATCH] Few fixes.

---
 doc/getting_started/install.rst       | 3 +--
 modoboa/core/commands/postfix_maps.py | 6 +++++-
 tests/install_from_scratch.py         | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/doc/getting_started/install.rst b/doc/getting_started/install.rst
index 4cb528003..611cf84ca 100644
--- a/doc/getting_started/install.rst
+++ b/doc/getting_started/install.rst
@@ -9,8 +9,7 @@ Requirements
 ************
 
 * `Python version 2.6+ <http://python.org/>`_
-* `Django version 1.6+ <http://docs.djangoproject.com/en/dev/intro/install/#intro-install>`_
-* `south version 0.7+ <http://south.aeracode.org/>`_
+* `Django version 1.7+ <http://docs.djangoproject.com/en/dev/intro/install/#intro-install>`_
 * `lxml python module <http://lxml.de/installation.html>`_
 * `pycrypto python module <http://www.dlitz.net/software/pycrypto/>`_
 * `rrdtool python binding <http://oss.oetiker.ch/rrdtool/>`_
diff --git a/modoboa/core/commands/postfix_maps.py b/modoboa/core/commands/postfix_maps.py
index c663841fe..81a5f3fa5 100644
--- a/modoboa/core/commands/postfix_maps.py
+++ b/modoboa/core/commands/postfix_maps.py
@@ -203,7 +203,11 @@ class RelayRecipientVerification(MapFile):
     filename = "sql-relay-recipient-verification.cf"
     mysql = "SELECT 'reject_unverified_recipient' FROM postfix_relay_domains_relaydomain WHERE verify_recipients=1 AND name='%d'"
     postgres = "SELECT 'reject_unverified_recipient' FROM postfix_relay_domains_relaydomain WHERE verify_recipients AND name='%d'"
-    sqlite = "SELECT 'reject_unverified_recipient' FROM postfix_relay_domains_relaydomain WHERE verify_recipients=1 AND name='%d'"
+    sqlite = (
+        "SELECT 'reject_unverified_recipient' "
+        "FROM postfix_relay_domains_relaydomain "
+        "WHERE verify_recipients=1 AND name='%d'"
+    )
 
 
 class PostfixMapsCommand(Command):
diff --git a/tests/install_from_scratch.py b/tests/install_from_scratch.py
index 3f0f7c3f4..fa2663afe 100644
--- a/tests/install_from_scratch.py
+++ b/tests/install_from_scratch.py
@@ -36,7 +36,7 @@ class DeployTest(unittest.TestCase):
     def test_standard(self):
         timeout = 2
         cmd = (
-            "modoboa-admin.py deploy --dbaction install --collectstatic {0}"
+            "modoboa-admin.py deploy --collectstatic {0}"
             .format(self.projname)
         )
         child = pexpect.spawn(cmd, cwd=self.workdir)
@@ -65,7 +65,7 @@ class DeployTest(unittest.TestCase):
             % (self.dbtype, self.dbuser, self.dbpassword,
                self.dbhost, self.projname)
         cmd = (
-            "modoboa-admin.py deploy --dbaction install --collectstatic "
+            "modoboa-admin.py deploy --collectstatic "
             "--dburl %s --domain %s %s"
             % (dburl, 'localhost', self.projname)
         )