Browse Source

PEP8

Signed-off-by: CapsLock <faimaison@legeox.net>
CapsLock 11 years ago
parent
commit
700cdaa047

+ 3 - 3
coin/billing/create_subscriptions_invoices.py

@@ -114,13 +114,13 @@ def create_member_invoice_for_a_period(member, date):
             # Si la période de facturation varie par rapport à celle prévue par
             # l'offre, calcul au prorata en faisant varier la quantité
             period_number_of_days = (period_to - period_from).days + 1
-            if (planned_period_number_of_days != period_number_of_days):
+            if planned_period_number_of_days != period_number_of_days:
                 quantity = (Decimal(period_number_of_days) /
                             Decimal(planned_period_number_of_days))
 
             # Si durée de 0jours ou dates incohérentes, alors on ajoute pas
             # (Si la period est de 0jours c'est que la facture existe déjà.)
-            if (period_from<period_to):
+            if period_from<period_to:
                 # Ajout l'item de l'offre correspondant à l'abonnement
                 # à la facture
                 invoice.details.create(label=offer.name,
@@ -131,7 +131,7 @@ def create_member_invoice_for_a_period(member, date):
                                        period_to=period_to)
     
     # S'il n'y a pas d'items dans la facture, ne commit pas la transaction.
-    if (invoice.details.count()>0):
+    if invoice.details.count() > 0:
         invoice.save()
         transaction.savepoint_commit(sid)
         return invoice

+ 1 - 2
coin/billing/models.py

@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
 import datetime
-import calendar
 import random
 from decimal import Decimal
 from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
-from coin.offers.models import Offer, OfferSubscription
+from coin.offers.models import OfferSubscription
 from coin.members.models import Member
 
 

+ 2 - 1
coin/members/models.py

@@ -88,7 +88,8 @@ class Member(CoinLdapSyncModel):
         """
         True si le membre est à jour de cotisation. False sinon
         """
-        if self.end_date_of_membership() and self.end_date_of_membership() >= datetime.date.today():
+        if self.end_date_of_membership() \
+                and self.end_date_of_membership() >= datetime.date.today():
             return True
         else:
             return False

+ 2 - 2
coin/vpn/models.py

@@ -2,9 +2,8 @@
 from django.db import models
 from django.core.exceptions import ValidationError
 from netfields import InetAddressField, NetManager
-from netaddr import IPAddress
 import ldapdb.models
-from ldapdb.models.fields import CharField, IntegerField, ListField
+from ldapdb.models.fields import CharField, ListField
 
 from coin.models import CoinLdapSyncModel
 from coin import utils
@@ -14,6 +13,7 @@ def validate_v4(address):
     if address.version != 4:
         raise ValidationError('{} is not an IPv4 address'.format(address))
 
+
 def validate_v6(address):
     if address.version != 6:
         raise ValidationError('{} is not an IPv6 address'.format(address))