PEP8 fixes and module renames.

modoboa/core/views/admin.py

@@ -15,7 +15,7 @@ from modoboa.core.models import Extension, Log
 from modoboa.core.utils import new_version_available
 from modoboa.lib import events, parameters
 from modoboa.lib.listing import get_sort_order, get_listing_page
-from modoboa.lib.webutils import (
+from modoboa.lib.web_utils import (
     _render_to_string, render_to_json_response
 )
 

modoboa/core/views/auth.py

@@ -6,7 +6,7 @@ from django.http import HttpResponse, HttpResponseRedirect
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
 from modoboa.lib import events, parameters
-from modoboa.lib.webutils import _render_to_string
+from modoboa.lib.web_utils import _render_to_string
 from modoboa.core.forms import LoginForm
 
 

modoboa/core/views/user.py

@@ -2,7 +2,7 @@ from django.shortcuts import render
 from django.utils.translation import ugettext as _
 from django.contrib.auth.decorators import login_required
 from modoboa.lib import events, parameters
-from modoboa.lib.webutils import (
+from modoboa.lib.web_utils import (
     _render_to_string, render_to_json_response
 )
 from modoboa.lib.cryptutils import encrypt

modoboa/demo/__init__.py

@@ -3,7 +3,7 @@ from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext_lazy as _
 from django.template.loader import render_to_string
 from modoboa.lib import events
-from modoboa.lib.webutils import static_url
+from modoboa.lib.web_utils import static_url
 
 
 @events.observe("UserMenuDisplay")

modoboa/demo/views.py

@@ -3,8 +3,8 @@ import os
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.utils.translation import ugettext as _
-from modoboa.lib.webutils import render_to_json_response
-from modoboa.lib.emailutils import sendmail_simple, sendmail_fromfile
+from modoboa.lib.web_utils import render_to_json_response
+from modoboa.lib.email_utils import sendmail_simple, sendmail_fromfile
 from modoboa.extensions.admin.lib import needs_mailbox
 
 

modoboa/extensions/admin/__init__.py

@@ -4,7 +4,7 @@ from django.core.urlresolvers import reverse
 from modoboa.core.extensions import ModoExtension, exts_pool
 from modoboa.lib import parameters, events
 from modoboa.lib.exceptions import PermDeniedException, BadRequest, Conflict
-from modoboa.lib.emailutils import split_mailbox
+from modoboa.lib.email_utils import split_mailbox
 from modoboa.extensions.admin.models import (
     Domain, DomainAlias, Mailbox, Alias
 )

modoboa/extensions/admin/forms/account.py

@@ -5,11 +5,11 @@ from django.core.urlresolvers import reverse
 from modoboa.lib import events, parameters
 from modoboa.lib.exceptions import PermDeniedException, Conflict, NotFound
 from modoboa.lib.permissions import get_account_roles
-from modoboa.lib.emailutils import split_mailbox
+from modoboa.lib.email_utils import split_mailbox
 from modoboa.lib.form_utils import (
     DomainNameField, DynamicForm, TabForms, WizardForm
 )
-from modoboa.lib.webutils import render_to_json_response
+from modoboa.lib.web_utils import render_to_json_response
 from modoboa.core.models import User
 from modoboa.extensions.admin.models import (
     Domain, Mailbox, Alias
@@ -454,7 +454,7 @@ class AccountWizard(WizardForm):
         })
 
     def done(self):
-        from modoboa.lib.webutils import render_to_json_response
+        from modoboa.lib.web_utils import render_to_json_response
 
         account = self.first_step.form.save()
         account.post_create(self.request.user)

modoboa/extensions/admin/forms/alias.py

@@ -2,7 +2,7 @@ from django import forms
 from django.utils.translation import ugettext as _, ugettext_lazy
 from django.http import QueryDict
 from modoboa.lib.exceptions import BadRequest, NotFound, Conflict
-from modoboa.lib.emailutils import split_mailbox
+from modoboa.lib.email_utils import split_mailbox
 from modoboa.lib.form_utils import (
     DynamicForm
 )

modoboa/extensions/admin/forms/domain.py

@@ -8,7 +8,7 @@ from modoboa.lib.exceptions import ModoboaException, Conflict
 from modoboa.lib.form_utils import (
     DomainNameField, YesNoField, WizardForm, DynamicForm, TabForms
 )
-from modoboa.lib.webutils import render_to_json_response
+from modoboa.lib.web_utils import render_to_json_response
 from modoboa.core.models import User
 from modoboa.extensions.admin.lib import check_if_domain_exists
 from modoboa.extensions.admin.models import (

modoboa/extensions/admin/forms/forward.py

@@ -1,7 +1,7 @@
 from django import forms
 from django.utils.translation import ugettext as _, ugettext_lazy
 from modoboa.lib.exceptions import BadRequest, PermDeniedException
-from modoboa.lib.emailutils import split_mailbox
+from modoboa.lib.email_utils import split_mailbox
 from modoboa.extensions.admin.models import (
     Domain
 )

modoboa/extensions/admin/lib.py

@@ -7,7 +7,7 @@ from django.utils.translation import ugettext as _
 from modoboa.core.models import User
 from modoboa.lib import events
 from modoboa.lib.exceptions import PermDeniedException
-from modoboa.lib.emailutils import split_mailbox
+from modoboa.lib.email_utils import split_mailbox
 from modoboa.extensions.admin.models import (
     Domain, Alias
 )

modoboa/extensions/admin/models/alias.py

@@ -1,7 +1,7 @@
 import reversion
 from django.db import models
 from django.utils.translation import ugettext as _, ugettext_lazy
-from modoboa.lib.emailutils import split_mailbox
+from modoboa.lib.email_utils import split_mailbox
 from modoboa.lib.exceptions import (
     PermDeniedException, BadRequest, Conflict
 )

modoboa/extensions/admin/templatetags/admin_tags.py

@@ -9,7 +9,7 @@ from django.utils.translation import ugettext as _, ugettext_lazy
 
 from modoboa.lib import events
 from modoboa.lib.templatetags.lib_tags import render_link
-from modoboa.lib.webutils import render_actions
+from modoboa.lib.web_utils import render_actions
 
 register = template.Library()
 

modoboa/extensions/admin/views/alias.py

@@ -7,7 +7,7 @@ from django.contrib.auth.decorators import (
     login_required, permission_required
 )
 from modoboa.lib import events
-from modoboa.lib.webutils import render_to_json_response
+from modoboa.lib.web_utils import render_to_json_response
 from modoboa.lib.exceptions import PermDeniedException, Conflict
 from modoboa.extensions.admin.forms import AliasForm
 from modoboa.extensions.admin.models import Alias

modoboa/extensions/admin/views/domain.py

@@ -15,7 +15,7 @@ import reversion
 
 from modoboa.core.models import User
 from modoboa.lib import parameters, events
-from modoboa.lib.webutils import (
+from modoboa.lib.web_utils import (
     _render_to_string, render_to_json_response
 )
 from modoboa.lib.exceptions import (

modoboa/extensions/admin/views/identity.py

@@ -14,7 +14,7 @@ from modoboa.lib import parameters, events
 from modoboa.lib.exceptions import (
     PermDeniedException, BadRequest
 )
-from modoboa.lib.webutils import (
+from modoboa.lib.web_utils import (
     _render_to_string, render_to_json_response
 )
 from modoboa.core.models import User

modoboa/extensions/admin/views/user.py

@@ -1,7 +1,7 @@
 import reversion
 from django.contrib.auth.decorators import login_required
 from django.utils.translation import ugettext as _
-from modoboa.lib.webutils import (
+from modoboa.lib.web_utils import (
     render_to_json_response, _render_to_string
 )
 from modoboa.extensions.admin.lib import needs_mailbox

modoboa/extensions/amavis/lib.py

@@ -11,10 +11,10 @@ from django.core.urlresolvers import reverse
 
 from modoboa.extensions.admin.models import Mailbox, Alias
 from modoboa.lib import parameters
-from modoboa.lib.emailutils import split_mailbox
+from modoboa.lib.email_utils import split_mailbox
 from modoboa.lib.exceptions import InternalError
 from modoboa.lib.sysutils import exec_cmd
-from modoboa.lib.webutils import NavigationParameters
+from modoboa.lib.web_utils import NavigationParameters
 from .models import Users, Policy
 
 

modoboa/extensions/amavis/management/commands/amnotify.py

@@ -10,7 +10,7 @@ from django.utils.translation import ugettext as _
 from modoboa.core.management.commands import CloseConnectionMixin
 from modoboa.core.models import User
 from modoboa.lib import parameters
-from modoboa.lib.emailutils import sendmail_simple
+from modoboa.lib.email_utils import sendmail_simple
 from modoboa.extensions.admin.models import Domain
 
 from modoboa.extensions.amavis import Amavis

modoboa/extensions/amavis/sql_email.py

@@ -5,7 +5,7 @@ An email representation based on a database record.
 
 from django.template.loader import render_to_string
 
-from modoboa.lib.emailutils import Email
+from modoboa.lib.email_utils import Email
 
 from .sql_connector import get_connector
 

modoboa/extensions/amavis/views.py

@@ -16,7 +16,7 @@ from django.contrib.auth.decorators import login_required
 from modoboa.lib import parameters
 from modoboa.lib.exceptions import BadRequest
 from modoboa.lib.paginator import Paginator
-from modoboa.lib.webutils import (
+from modoboa.lib.web_utils import (
     getctx, render_to_json_response, _render_to_string
 )
 from modoboa.extensions.admin.models import Mailbox, Domain

modoboa/extensions/postfix_autoreply/management/commands/autoreply.py

@@ -8,7 +8,7 @@ from django.utils import timezone
 
 from modoboa.core.management.commands import CloseConnectionMixin
 from modoboa.lib import parameters
-from modoboa.lib.emailutils import split_mailbox, sendmail_simple
+from modoboa.lib.email_utils import split_mailbox, sendmail_simple
 from modoboa.extensions.admin.models import Mailbox
 from modoboa.extensions.postfix_autoreply import PostfixAutoreply
 from modoboa.extensions.postfix_autoreply.models import ARmessage, ARhistoric

modoboa/extensions/postfix_autoreply/views.py

@@ -2,7 +2,7 @@
 from datetime import date
 from django.contrib.auth.decorators import login_required
 from django.utils.translation import ugettext as _
-from modoboa.lib.webutils import (
+from modoboa.lib.web_utils import (
     render_to_json_response, _render_to_string
 )
 from modoboa.extensions.admin.lib import needs_mailbox

modoboa/extensions/postfix_relay_domains/forms.py

@@ -7,7 +7,7 @@ from django.utils.translation import ugettext as _, ugettext_lazy
 from django.core.urlresolvers import reverse
 from modoboa.lib import events
 from modoboa.lib.form_utils import DynamicForm, DomainNameField, TabForms
-from modoboa.lib.webutils import render_to_json_response
+from modoboa.lib.web_utils import render_to_json_response
 from modoboa.extensions.admin.models import Domain, DomainAlias
 from .models import RelayDomain, RelayDomainAlias
 

modoboa/extensions/postfix_relay_domains/views.py

@@ -9,7 +9,7 @@ from django.contrib.auth.decorators import (
 )
 from modoboa.lib import events
 from modoboa.lib.exceptions import PermDeniedException
-from modoboa.lib.webutils import render_to_json_response
+from modoboa.lib.web_utils import render_to_json_response
 from .models import RelayDomain, Service
 from .forms import RelayDomainForm, RelayDomainFormGeneral
 

modoboa/extensions/radicale/forms.py

@@ -4,7 +4,7 @@ Radicale extension forms.
 from django import forms
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _, ugettext_lazy
-from modoboa.lib.webutils import render_to_json_response
+from modoboa.lib.web_utils import render_to_json_response
 from modoboa.lib.form_utils import WizardForm, TabForms, DynamicForm
 from modoboa.extensions.admin.models import Domain, Mailbox
 from modoboa.extensions.radicale.models import UserCalendar, SharedCalendar
@@ -109,7 +109,7 @@ class RightsForm(forms.Form, DynamicForm):
     def save(self):
         """Custom save method."""
         import re
-        from modoboa.lib.emailutils import split_mailbox
+        from modoboa.lib.email_utils import split_mailbox
         from modoboa.lib.exceptions import BadRequest
         from modoboa.extensions.admin.models import Mailbox
         from .models import AccessRule

modoboa/extensions/radicale/templatetags/radicale_tags.py

@@ -5,7 +5,7 @@ from django import template
 from django.template.loader import render_to_string
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
-from modoboa.lib.webutils import render_actions
+from modoboa.lib.web_utils import render_actions
 from modoboa.lib.templatetags.lib_tags import render_link
 
 

modoboa/extensions/radicale/views.py

@@ -11,7 +11,7 @@ from django.contrib.auth.decorators import (
 from django.utils.translation import ugettext as _
 
 from modoboa.lib.listing import get_sort_order, get_listing_page
-from modoboa.lib.webutils import (
+from modoboa.lib.web_utils import (
     _render_to_string, render_to_json_response
 )
 from modoboa.lib.exceptions import NotFound, PermDeniedException

modoboa/extensions/sievefilters/templatetags/sfilters_tags.py

@@ -3,7 +3,7 @@ from django.core.urlresolvers import reverse
 from django.template.loader import render_to_string
 from django.utils.translation import ugettext as _
 
-from modoboa.lib.webutils import render_actions
+from modoboa.lib.web_utils import render_actions
 from modoboa.lib.templatetags.form_tags import configure_field_classes
 
 register = template.Library()

modoboa/extensions/sievefilters/views.py

@@ -9,7 +9,7 @@ from django.contrib.auth.decorators import login_required
 from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse
 from modoboa.lib import parameters
-from modoboa.lib.webutils import _render_error, \
+from modoboa.lib.web_utils import _render_error, \
     ajax_response, render_to_json_response
 from modoboa.lib.connections import ConnectionError
 from modoboa.lib.exceptions import BadRequest

modoboa/extensions/stats/views.py

@@ -10,7 +10,7 @@ from django.contrib.auth.decorators import (
 from modoboa.core.extensions import exts_pool
 from modoboa.lib import events
 from modoboa.lib.exceptions import BadRequest, PermDeniedException, NotFound
-from modoboa.lib.webutils import (
+from modoboa.lib.web_utils import (
     render_to_json_response
 )
 from modoboa.extensions.admin.models import (

modoboa/extensions/webmail/forms.py

@@ -9,7 +9,7 @@ from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
 from modoboa.lib import parameters
-from modoboa.lib.emailutils import set_email_headers
+from modoboa.lib.email_utils import set_email_headers
 from .lib import (
     ImapEmail, create_mail_attachment
 )

modoboa/extensions/webmail/lib/attachments.py

@@ -4,7 +4,7 @@ from django.conf import settings
 from django.core.files.uploadhandler import FileUploadHandler, SkipFile
 from modoboa.lib import parameters
 from modoboa.lib.exceptions import InternalError
-from modoboa.lib.webutils import size2integer
+from modoboa.lib.web_utils import size2integer
 
 
 def set_compose_session(request):

modoboa/extensions/webmail/lib/imapemail.py

@@ -12,7 +12,7 @@ from django.conf import settings
 from django.utils.translation import ugettext as _
 
 from modoboa.lib import parameters, u2u_decode
-from modoboa.lib.emailutils import Email, EmailAddress
+from modoboa.lib.email_utils import Email, EmailAddress
 from .imaputils import (
     get_imapconnector, BodyStructure
 )

modoboa/extensions/webmail/lib/imapheader.py

@@ -2,7 +2,7 @@
 Set of functions used to parse and transform email headers.
 """
 import chardet
-from modoboa.lib.emailutils import EmailAddress
+from modoboa.lib.email_utils import EmailAddress
 
 __all__ = [
     'parse_from', 'parse_to', 'parse_message_id', 'parse_date',

modoboa/extensions/webmail/lib/imaputils.py

@@ -13,7 +13,7 @@ from django.utils.translation import ugettext as _
 from modoboa.lib import parameters, imap_utf7
 from modoboa.lib.exceptions import InternalError
 from modoboa.lib.connections import ConnectionsManager
-from modoboa.lib.webutils import static_url
+from modoboa.lib.web_utils import static_url
 from ..exceptions import ImapError, WebmailInternalError
 from .fetch_parser import parse_fetch_response
 

modoboa/extensions/webmail/lib/sendmail.py

@@ -1,7 +1,7 @@
 import smtplib
 from modoboa.lib import parameters
-from modoboa.lib.emailutils import prepare_addresses
-from modoboa.lib.webutils import _render_to_string
+from modoboa.lib.email_utils import prepare_addresses
+from modoboa.lib.web_utils import _render_to_string
 from modoboa.lib.cryptutils import get_password
 from modoboa.extensions.webmail.exceptions import WebmailInternalError
 from . import get_imapconnector, clean_attachments

modoboa/extensions/webmail/lib/utils.py

@@ -1,7 +1,7 @@
 """
 Misc. utilities.
 """
-from modoboa.lib.webutils import NavigationParameters
+from modoboa.lib.web_utils import NavigationParameters
 
 
 def decode_payload(encoding, payload):

modoboa/extensions/webmail/views.py

@@ -20,7 +20,7 @@ from django.views.decorators.gzip import gzip_page
 from modoboa.lib import parameters
 from modoboa.lib.exceptions import ModoboaException, BadRequest
 from modoboa.lib.paginator import Paginator
-from modoboa.lib.webutils import (
+from modoboa.lib.web_utils import (
     _render_to_string, ajax_response, render_to_json_response
 )
 from modoboa.extensions.admin.lib import needs_mailbox

modoboa/lib/authbackends.py

@@ -4,7 +4,7 @@ from django.contrib.auth.backends import ModelBackend
 
 from modoboa.core.models import User
 from modoboa.lib import parameters
-from modoboa.lib.emailutils import split_mailbox
+from modoboa.lib.email_utils import split_mailbox
 
 
 class SimpleBackend(ModelBackend):

modoboa/lib/connections.py

@@ -2,10 +2,13 @@ from modoboa.lib.cryptutils import decrypt
 
 
 class ConnectionsManager(type):
-    """Singleton pattern implementation
+
+    """
+    Singleton pattern implementation.
 
     This class is specialized in connection management.
     """
+
     def __init__(cls, name, bases, ctx):
         super(ConnectionsManager, cls).__init__(name, bases, ctx)
         cls.instances = {}
@@ -16,7 +19,7 @@ class ConnectionsManager(type):
             key = kwargs["user"]
         else:
             return None
-        if not key in cls.instances:
+        if key not in cls.instances:
             cls.instances[key] = None
         if "password" in kwargs:
             kwargs["password"] = decrypt(kwargs["password"])

modoboa/lib/email_utils.py

@@ -1,16 +1,20 @@
 # coding: utf-8
-import time
+
 import re
 import smtplib
+import time
 from email.header import Header, decode_header
 from email.mime.text import MIMEText
 from email.utils import make_msgid, formatdate, parseaddr
-from django.template.loader import render_to_string
+
 from django.conf import settings
+from django.template.loader import render_to_string
+
 from modoboa.lib import u2u_decode
 
 
 class EmailAddress(object):
+
     def __init__(self, address):
         self.fulladdress = u2u_decode.u2u_decode(address).strip("\r\t\n")
         (self.name, self.address) = parseaddr(self.fulladdress)
@@ -22,6 +26,7 @@ class EmailAddress(object):
 
 
 class Email(object):
+
     def __init__(self, mailid, mformat="plain", dformat="plain", links=0):
         self.attached_map = {}
         self.contents = {"html": "", "plain": ""}
@@ -42,11 +47,12 @@ class Email(object):
 
     @property
     def body(self):
-        """Return email's body.
-        """
+        """Return email's body."""
         if self._body is None:
-            self._body = getattr(self, "viewmail_%s" % self.mformat) \
+            self._body = (
+                getattr(self, "viewmail_%s" % self.mformat)
                 (self.contents[self.mformat], links=self.links)
+            )
         return self._body
 
     def get_header(self, msg, hdrname):
@@ -231,19 +237,22 @@ def split_mailbox(mailbox):
     return (address, domain)
 
 
-def decode(s, encodings=('utf8', 'latin1', 'windows-1252', 'ascii'), charset=None):
+def decode(string, encodings=None, charset=None):
+    """Try to decode the given string."""
+    if encodings is None:
+        encodings = ('utf8', 'latin1', 'windows-1252', 'ascii')
     if charset is not None:
         try:
-            return s.decode(charset, 'ignore')
+            return string.decode(charset, 'ignore')
         except LookupError:
             pass
 
     for encoding in encodings:
         try:
-            return s.decode(encoding)
+            return string.decode(encoding)
         except UnicodeDecodeError:
             pass
-    return s.decode('ascii', 'ignore')
+    return string.decode('ascii', 'ignore')
 
 
 def prepare_addresses(addresses, usage="header"):
@@ -306,7 +315,8 @@ def __sendmail(sender, rcpt, msgstring, server='localhost', port=25):
     return True, None
 
 
-def sendmail_simple(sender, rcpt, subject="Sample message", content="", **kwargs):
+def sendmail_simple(
+        sender, rcpt, subject="Sample message", content="", **kwargs):
     """Simple way to send a text message
 
     Send a text/plain message with basic headers (msg-id, date).

modoboa/lib/form_utils.py

@@ -16,7 +16,7 @@ from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _, ugettext_lazy
 
 from modoboa.lib.exceptions import BadRequest
-from modoboa.lib.webutils import render_to_json_response
+from modoboa.lib.web_utils import render_to_json_response
 
 
 class WizardStep(object):

modoboa/lib/middleware.py

@@ -1,21 +1,24 @@
 # coding: utf-8
-"""
-Custom middlewares.
-"""
+
+"""Custom middlewares."""
+
 import re
+
 from django.http import Http404, HttpResponseRedirect
-from modoboa.core.models import Extension
+
 from modoboa.core.extensions import exts_pool
-from modoboa.lib.webutils import (
-    _render_error, ajax_response, render_to_json_response
-)
+from modoboa.core.models import Extension
 from modoboa.lib.exceptions import ModoboaException
 from modoboa.lib.signals import request_accessor
+from modoboa.lib.web_utils import (
+    _render_error, ajax_response, render_to_json_response
+)
 
 
 class ExtControlMiddleware(object):
+
     def process_view(self, request, view, args, kwargs):
-        m = re.match("modoboa\.extensions\.(\w+)", view.__module__)
+        m = re.match(r"modoboa\.extensions\.(\w+)", view.__module__)
         if m is None:
             return None
         try:
@@ -31,6 +34,7 @@ class ExtControlMiddleware(object):
 
 
 class AjaxLoginRedirect(object):
+
     def process_response(self, request, response):
         if request.is_ajax():
             if type(response) == HttpResponseRedirect:
@@ -39,6 +43,7 @@ class AjaxLoginRedirect(object):
 
 
 class CommonExceptionCatcher(object):
+
     def process_exception(self, request, exception):
         if not isinstance(exception, ModoboaException):
             return None
@@ -57,6 +62,7 @@ class CommonExceptionCatcher(object):
 
 
 class RequestCatcherMiddleware(object):
+
     """
     Simple middleware to store the current request.
     """

modoboa/lib/web_utils.py

@@ -3,16 +3,18 @@
 """
 This module contains extra functions/shortcuts used to render HTML.
 """
-import sys
-import re
+
 import json
-from django.core.urlresolvers import reverse
-from django.http import HttpResponse, HttpResponseRedirect
-from django.contrib.auth.decorators import login_required
-from django.shortcuts import render
-from django.template.loader import render_to_string
+import re
+import sys
+
 from django import template
 from django.conf import settings
+from django.contrib.auth.decorators import login_required
+from django.core.urlresolvers import reverse
+from django.http import HttpResponse, HttpResponseRedirect
+from django.shortcuts import render
+from django.template.loader import render_to_string
 
 
 def _render_to_string(request, tpl, user_context):
@@ -52,7 +54,7 @@ def getctx(status, level=1, callback=None, **kwargs):
 
 
 def ajax_response(request, status="ok", respmsg=None,
-                  url=None, ajaxnav=False, norefresh=False, 
+                  url=None, ajaxnav=False, norefresh=False,
                   template=None, **kwargs):
     """Ajax response shortcut
 
@@ -74,7 +76,7 @@ def ajax_response(request, status="ok", respmsg=None,
         ctx[k] = v
     if template is not None:
         content = _render_to_string(request, template, ctx)
-    elif kwargs.has_key("content"):
+    elif "content" in kwargs:
         content = kwargs["content"]
     else:
         content = ""
@@ -198,7 +200,7 @@ class NavigationParameters(object):
     def store(self):
         """Store navigation parameters into session.
         """
-        if not self.sessionkey in self.request.session:
+        if self.sessionkey not in self.request.session:
             self.request.session[self.sessionkey] = {}
         self._store_page()
         navparams = self.request.session[self.sessionkey]
@@ -222,7 +224,7 @@ class NavigationParameters(object):
         :param defaultvalue: default value if none is found
         :return: parameter's value
         """
-        if not self.sessionkey in self.request.session:
+        if self.sessionkey not in self.request.session:
             return default_value
         return self.request.session[self.sessionkey].get(param, default_value)
 

modoboa/tools/pfxadmin_migrate/management/commands/migrate_from_postfixadmin.py

@@ -41,7 +41,7 @@ from django.db import transaction
 
 import modoboa.core.models as core_models
 import modoboa.extensions.admin.models as admin_models
-from modoboa.lib.emailutils import split_mailbox
+from modoboa.lib.email_utils import split_mailbox
 from modoboa.extensions.admin import grant_access_to_all_objects
 
 from modoboa.tools.pfxadmin_migrate import models as pf_models