From 9b9a3734ff1dc9e55617cbdd706991244b4f47c8 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Wed, 1 Apr 2015 15:13:45 +0200
Subject: [PATCH 1/2] Rename license file.

fix #703
---
 COPYING => LICENSE | 0
 MANIFEST.in        | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename COPYING => LICENSE (100%)

diff --git a/COPYING b/LICENSE
similarity index 100%
rename from COPYING
rename to LICENSE
diff --git a/MANIFEST.in b/MANIFEST.in
index 88324387f..efcdcdd0c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
-include README.rst COPYING requirements.txt
+include README.rst LICENSE requirements.txt
 recursive-include modoboa *.html *.js *.css *.png *.po *.mo *.json *.gif *.ttf *.woff
 recursive-include modoboa/core/templates *.tpl
 recursive-include modoboa/core/commands/templates *.tpl

From b556920af508da586756fc46d38e4828b79ce2f3 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Wed, 1 Apr 2015 15:24:31 +0200
Subject: [PATCH 2/2] Fixing factories.

---
 .../postfix_relay_domains/factories.py        | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/modoboa/extensions/postfix_relay_domains/factories.py b/modoboa/extensions/postfix_relay_domains/factories.py
index 1a0c0a5a2..74400e0fb 100644
--- a/modoboa/extensions/postfix_relay_domains/factories.py
+++ b/modoboa/extensions/postfix_relay_domains/factories.py
@@ -4,14 +4,22 @@ from . import models
 
 
 class ServiceFactory(factory.DjangoModelFactory):
-    FACTORY_FOR = models.Service
-    FACTORY_DJANGO_GET_OR_CREATE = ('name', )
+
+    """Factory to create Service instances."""
+
+    class Meta:
+        model = models.Service
+        django_get_or_create = ('name', )
 
     name = 'dummy'
 
 
 class RelayDomainFactory(PermissionFactory):
-    FACTORY_FOR = models.RelayDomain
+
+    """Factory to create RelayDomain instances."""
+
+    class Meta:
+        model = models.RelayDomain
 
     target_host = 'external.host.tld'
     enabled = True
@@ -20,6 +28,10 @@ class RelayDomainFactory(PermissionFactory):
 
 
 class RelayDomainAliasFactory(PermissionFactory):
-    FACTORY_FOR = models.RelayDomainAlias
+
+    """Factory to create RelayDomainAliases instances."""
+
+    class Meta:
+        model = models.RelayDomainAlias
 
     enabled = True