PEP8 fixes

modoboa/extensions/postfix_relay_domains/__init__.py

@@ -1,13 +1,16 @@
 # coding: utf-8
 import sys
+
 from django.contrib.auth.models import Group, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.utils.translation import ugettext_lazy
-from modoboa.lib import events, parameters
-from modoboa.core.extensions import ModoExtension, exts_pool
-from .models import RelayDomain, RelayDomainAlias, Service
 
-extension_events = [
+from .models import RelayDomain, RelayDomainAlias, Service
+from modoboa.core.extensions import ModoExtension, exts_pool
+from modoboa.lib import events, parameters
+
+
+EXTENSION_EVENTS = [
     "RelayDomainCreated",
     "RelayDomainDeleted",
     "RelayDomainModified",
@@ -66,6 +69,9 @@ def init_amavis_dependant_features():
 
 
 class PostfixRelayDomains(ModoExtension):
+
+    """Extension declaration."""
+
     name = "postfix_relay_domains"
     label = "Postfix relay domains"
     version = "1.0"
@@ -88,17 +94,18 @@ class PostfixRelayDomains(ModoExtension):
         parameters.register(
             AdminParametersForm, ugettext_lazy("Relay domains")
         )
-        events.declare(extension_events)
+        events.declare(EXTENSION_EVENTS)
         from modoboa.extensions.postfix_relay_domains import general_callbacks
-        if 'modoboa.extensions.postfix_relay_domains.general_callbacks' in sys.modules:
+        prefix = "modoboa.extensions.postfix_relay_domains."
+        if prefix + "general_callbacks" in sys.modules:
             reload(general_callbacks)
         if exts_pool.is_extension_enabled('limits'):
             import limits_callbacks
-            if 'modoboa.extensions.postfix_relay_domains.limits_callbacks' in sys.modules:
+            if prefix + "limits_callbacks" in sys.modules:
                 reload(limits_callbacks)
         if exts_pool.is_extension_enabled('amavis'):
             import amavis_callbacks
-            if 'modoboa.extensions.postfix_relay_domains.amavis_callbacks' in sys.modules:
+            if prefix + "amavis_callbacks" in sys.modules:
                 reload(amavis_callbacks)
 
     def destroy(self):

modoboa/extensions/postfix_relay_domains/forms.py

@@ -2,14 +2,15 @@
 Postfix relay domains extension forms.
 """
 from django import forms
+from django.core.urlresolvers import reverse
 from django.http import QueryDict
 from django.utils.translation import ugettext as _, ugettext_lazy
-from django.core.urlresolvers import reverse
+
+from .models import RelayDomain, RelayDomainAlias
+from modoboa.extensions.admin.models import Domain, DomainAlias
 from modoboa.lib import events
 from modoboa.lib.form_utils import DynamicForm, DomainNameField, TabForms
 from modoboa.lib.web_utils import render_to_json_response
-from modoboa.extensions.admin.models import Domain, DomainAlias
-from .models import RelayDomain, RelayDomainAlias
 
 
 class RelayDomainFormGeneral(forms.ModelForm, DynamicForm):
@@ -113,7 +114,7 @@ class RelayDomainFormGeneral(forms.ModelForm, DynamicForm):
                     continue
                 aliases.append(v)
             for rdalias in rd.relaydomainalias_set.all():
-                if not rdalias.name in aliases:
+                if rdalias.name not in aliases:
                     rdalias.delete()
                 else:
                     aliases.remove(rdalias.name)
@@ -137,11 +138,13 @@ class RelayDomainFormGeneral(forms.ModelForm, DynamicForm):
 
 
 class RelayDomainForm(TabForms):
+
     """Specific edition form for relay domains.
 
     We use a *tabs* compatible form because extensions can add their
     own tab. (ex: amavis)
     """
+
     def __init__(self, request, *args, **kwargs):
         self.user = request.user
         self.forms = []

modoboa/extensions/postfix_relay_domains/general_callbacks.py

@@ -1,10 +1,13 @@
-from django.core.urlresolvers import reverse
-from django.template import Template, Context
+"""General event callbacks."""
+
 from django.conf import settings
-from django.utils.translation import ugettext_lazy
+from django.core.urlresolvers import reverse
 from django.db.models import Q
-from modoboa.lib import events
+from django.template import Template, Context
+from django.utils.translation import ugettext_lazy
+
 from .models import RelayDomain, RelayDomainAlias
+from modoboa.lib import events
 
 
 @events.observe('GetStaticContent')
@@ -101,7 +104,8 @@ def extra_limit_templates():
          ugettext_lazy('Maximum number of relay domains this user can create'),
          'Resellers'),
         ("relay_domain_aliases_limit", ugettext_lazy("Relay domain aliases"),
-         ugettext_lazy('Maximum number of relay domain aliases this user can create'),
+         ugettext_lazy(
+             'Maximum number of relay domain aliases this user can create'),
          'Resellers'),
     ]
 

modoboa/extensions/postfix_relay_domains/limits_callbacks.py

@@ -1,8 +1,11 @@
+"""Callbacks related to limits extension."""
+
 from django.utils.translation import ugettext_lazy
+
+from .models import RelayDomainAlias
+from modoboa.extensions.limits.lib import inc_limit_usage, dec_limit_usage
 from modoboa.lib import events
 from modoboa.lib.permissions import get_object_owner
-from modoboa.extensions.limits.lib import inc_limit_usage, dec_limit_usage
-from .models import RelayDomainAlias
 
 
 @events.observe('GetExtraParameters')
@@ -16,17 +19,23 @@ def extra_parameters(app, level):
             label=ugettext_lazy("Relay domains"),
             initial=0,
             help_text=ugettext_lazy(
-                "Maximum number of allowed relay domains for a new administrator"
+                "Maximum number of allowed relay domains for a new "
+                "administrator"
             ),
-            widget=forms.widgets.TextInput(attrs={"class": "col-md-1 form-control"})
+            widget=forms.widgets.TextInput(
+                attrs={
+                    "class": "col-md-1 form-control"})
         ),
         'deflt_relay_domain_aliases_limit': forms.IntegerField(
             label=ugettext_lazy("Relay domain aliases"),
             initial=0,
             help_text=ugettext_lazy(
-                "Maximum number of allowed relay domain aliases for a new administrator"
+                "Maximum number of allowed relay domain aliases for a new "
+                "administrator"
             ),
-            widget=forms.widgets.TextInput(attrs={"class": "col-md-1 form-control"})
+            widget=forms.widgets.TextInput(
+                attrs={
+                    "class": "col-md-1 form-control"})
         )
     }
 

modoboa/extensions/postfix_relay_domains/models.py

@@ -1,12 +1,16 @@
-import reversion
+"""Relay domain related models."""
+
+from django.contrib.contenttypes import generic
 from django.db import models
 from django.db.models.manager import Manager
-from django.contrib.contenttypes import generic
 from django.utils.translation import ugettext as _, ugettext_lazy
+
+import reversion
+
 from modoboa.core.models import ObjectAccess
+from modoboa.extensions.admin.models import AdminObject
 from modoboa.lib import parameters
 from modoboa.lib.exceptions import BadRequest, NotFound
-from modoboa.extensions.admin.models import AdminObject
 
 
 class RelayDomainManager(Manager):
@@ -46,12 +50,13 @@ class ServiceManager(Manager):
             services.append(parts[0])
         to_delete = []
         for service in self.all():
-            if not service.name in services:
+            if service.name not in services:
                 to_delete.append(service.name)
         Service.objects.filter(name__in=to_delete).delete()
 
 
 class Service(models.Model):
+
     """Postfix service.
     """
     name = models.CharField(
@@ -66,6 +71,7 @@ class Service(models.Model):
 
 
 class RelayDomain(AdminObject):
+
     """Relay domain.
 
     A relay domain differs from a usual domaine because its final
@@ -101,7 +107,7 @@ class RelayDomain(AdminObject):
     def tags(self):
         return [
             {"name": "relaydomain", "label": _("Relay Domain"), "type": "dom"},
-            {"name": self.service.name, "label": "%s:" % self.service.name, 
+            {"name": self.service.name, "label": "%s:" % self.service.name,
              "type": "srv", "color": "info"}
         ]
 
@@ -118,7 +124,7 @@ class RelayDomain(AdminObject):
         :param csvwriter:
         """
         csvwriter.writerow(
-            ["relaydomain", self.name, self.target_host, 
+            ["relaydomain", self.name, self.target_host,
              self.service.name, self.enabled, self.verify_recipients]
         )
         for rdalias in self.relaydomainalias_set.all():
@@ -134,7 +140,8 @@ class RelayDomain(AdminObject):
             raise BadRequest(_("Invalid line"))
         self.name = row[1].strip()
         self.target_host = row[2].strip()
-        self.service, created = Service.objects.get_or_create(name=row[3].strip())
+        self.service, created = Service.objects.get_or_create(
+            name=row[3].strip())
         self.enabled = (row[4].strip() == 'True')
         self.verify_recipients = (row[5].strip() == 'True')
         self.save(creator=user)
@@ -152,6 +159,7 @@ reversion.register(RelayDomain)
 
 
 class RelayDomainAlias(AdminObject):
+
     """Relay domain alias.
 
     """