From 3914a49df63f4899b2e11925b44a665c958507f9 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Tue, 13 Jan 2015 22:02:25 +0100
Subject: [PATCH] PEP8 fixes

---
 modoboa/lib/db_utils.py               | 2 +-
 modoboa/lib/ldap_utils.py             | 7 ++++++-
 modoboa/lib/listing.py                | 3 ++-
 modoboa/lib/permissions.py            | 3 ++-
 modoboa/lib/signals.py                | 9 ++++-----
 modoboa/lib/templatetags/form_tags.py | 2 +-
 modoboa/lib/tests.py                  | 7 ++++---
 7 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/modoboa/lib/db_utils.py b/modoboa/lib/db_utils.py
index 242a24163..156fc5077 100644
--- a/modoboa/lib/db_utils.py
+++ b/modoboa/lib/db_utils.py
@@ -34,7 +34,7 @@ def db_type(cname="default"):
     :param str cname: connection name
     :return: a string or None
     """
-    if not cname in settings.DATABASES:
+    if cname not in settings.DATABASES:
         raise InternalError(
             _("Connection to database %s not configured" % cname))
     for t in ['postgres', 'mysql', 'sqlite']:
diff --git a/modoboa/lib/ldap_utils.py b/modoboa/lib/ldap_utils.py
index b83e0971c..3ba247dac 100644
--- a/modoboa/lib/ldap_utils.py
+++ b/modoboa/lib/ldap_utils.py
@@ -34,14 +34,17 @@ Extracted from `this blog
 
 """
 import ldap
+
 from django.conf import settings
 from django.utils.translation import ugettext as _
+
 from modoboa.core.password_hashers import get_password_hasher
 from modoboa.lib import parameters
 from modoboa.lib.exceptions import InternalError
 
 
 class LDAPAuthBackend(object):
+
     def __init__(self):
         self.server_uri = self._setting(
             "AUTH_LDAP_SERVER_URI", "ldap://localhost"
@@ -102,7 +105,9 @@ class LDAPAuthBackend(object):
         try:
             self.connect_to_server(user, password)
             if self.ldap_ad:
-                newpassword = ('"%s"' % newpassword).encode('utf-16').lstrip('\377\376')
+                newpassword = (
+                    ('"%s"' % newpassword).encode('utf-16').lstrip('\377\376')
+                )
             ldif = [(ldap.MOD_REPLACE,
                      self.pwd_attr,
                      self._crypt_password(newpassword))]
diff --git a/modoboa/lib/listing.py b/modoboa/lib/listing.py
index 858b85b31..3ae82d832 100644
--- a/modoboa/lib/listing.py
+++ b/modoboa/lib/listing.py
@@ -1,4 +1,5 @@
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
+
 from modoboa.lib import parameters
 
 
@@ -16,7 +17,7 @@ def get_sort_order(qdict, default, allowed_values=None):
         sort_order = sort_order[1:]
     else:
         sort_dir = ""
-    if allowed_values is not None and not sort_order in allowed_values:
+    if allowed_values is not None and sort_order not in allowed_values:
         return (default, "")
     return (sort_order, sort_dir)
 
diff --git a/modoboa/lib/permissions.py b/modoboa/lib/permissions.py
index a4b3487d3..b1a136b99 100644
--- a/modoboa/lib/permissions.py
+++ b/modoboa/lib/permissions.py
@@ -81,7 +81,8 @@ def grant_access_to_objects(user, objects, ct):
     """
     for obj in objects:
         try:
-            ObjectAccess.objects.create(user=user, content_type=ct, object_id=obj.id)
+            ObjectAccess.objects.create(
+                user=user, content_type=ct, object_id=obj.id)
         except IntegrityError:
             pass
 
diff --git a/modoboa/lib/signals.py b/modoboa/lib/signals.py
index fbd5baad8..551898a40 100644
--- a/modoboa/lib/signals.py
+++ b/modoboa/lib/signals.py
@@ -1,11 +1,10 @@
-"""
-Custom signals.
-"""
+"""Custom signals."""
+
 from django.dispatch import Signal
 
 request_accessor = Signal()
 
+
 def get_request():
-    """Get the current request from anywhere.
-    """
+    """Get the current request from anywhere."""
     return request_accessor.send(None)[0][1]
diff --git a/modoboa/lib/templatetags/form_tags.py b/modoboa/lib/templatetags/form_tags.py
index cd8bf8a87..4a2ae2034 100644
--- a/modoboa/lib/templatetags/form_tags.py
+++ b/modoboa/lib/templatetags/form_tags.py
@@ -63,7 +63,7 @@ def render_fields_group(form, pattern):
     haserror = len(first.errors) != 0
     while True:
         fname = "%s_%d" % (pattern, cpt)
-        if not fname in form.fields:
+        if fname not in form.fields:
             break
         bfield = forms.forms.BoundField(form, form.fields[fname], fname)
         if len(bfield.errors):
diff --git a/modoboa/lib/tests.py b/modoboa/lib/tests.py
index cdf66b3db..5eee3edbd 100644
--- a/modoboa/lib/tests.py
+++ b/modoboa/lib/tests.py
@@ -11,13 +11,14 @@ class ModoTestCase(TestCase):
 
     def setUp(self, username="admin", password="password"):
         self.clt = Client()
-        self.assertEqual(self.clt.login(username=username, password=password), True)
+        self.assertEqual(
+            self.clt.login(username=username, password=password), True)
 
     def ajax_request(self, method, url, params=None, status=200):
         if params is None:
             params = {}
-        response = getattr(self.clt, method) \
-            (url, params, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        response = getattr(self.clt, method)(
+            url, params, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
         self.assertEqual(response.status_code, status)
         return json.loads(response.content)