Fixup spacing for pep8

diff --git a/code/pgeusite/cmutuel/admin.py b/code/pgeusite/cmutuel/admin.py
index b62f4d15d573366e1fcecd6f14a84f9631f2c00d..68c3f62ea42c0216a71b4b27bdbdf949169ec92a 100644 (file)
--- a/code/pgeusite/cmutuel/admin.py
+++ b/code/pgeusite/cmutuel/admin.py
@@ -2,7 +2,9 @@ from django.contrib import admin
 
 from models import CMutuelTransaction
 
+
 class CMutuelTransactionAdmin(admin.ModelAdmin):
     list_display = ('opdate', 'amount', 'description', 'balance', 'sent', )
 
+
 admin.site.register(CMutuelTransaction, CMutuelTransactionAdmin)

diff --git a/code/pgeusite/cmutuel/management/commands/cmscrape.py b/code/pgeusite/cmutuel/management/commands/cmscrape.py
index 1889103cb415bfbb8ddbc98fc92b4468a7ac40e2..7c7f84df70183a5d86e147da8226148d96aa64ff 100755 (executable)
--- a/code/pgeusite/cmutuel/management/commands/cmscrape.py
+++ b/code/pgeusite/cmutuel/management/commands/cmscrape.py
@@ -22,6 +22,7 @@ from postgresqleu.mailqueue.util import send_simple_mail
 
 from pgeusite.cmutuel.models import CMutuelTransaction
 
+
 class FormHtmlParser(HTMLParser):
     def __init__(self):
         HTMLParser.__init__(self)
@@ -30,13 +31,14 @@ class FormHtmlParser(HTMLParser):
 
     def handle_starttag(self, tag, attrs):
         if tag == 'form':
-            for k,v in attrs:
+            for k, v in attrs:
                 if k == 'action':
                     if v.find('telechargement.cgi?'):
                         self.in_form = True
                         self.target_url = v
                         return
 
+
 class CurlWrapper(object):
     def __init__(self):
         self.curl = pycurl.Curl()
@@ -65,15 +67,16 @@ class CurlWrapper(object):
 
     def expect_redirect(self, fetchpage, redirectto, postdata=None):
         if postdata:
-            (c,s) = self.post(fetchpage, postdata)
+            (c, s) = self.post(fetchpage, postdata)
         else:
-            (c,s) = self.get(fetchpage)
+            (c, s) = self.get(fetchpage)
         if c.getinfo(pycurl.RESPONSE_CODE) != 302:
             raise CommandError("Supposed to receive 302 for %s, got %s" % (fetchpage, c.getinfo(c.RESPONSE_CODE)))
         if not isinstance(redirectto, list):
             redirrectto = [redirectto, ]
         if not c.getinfo(pycurl.REDIRECT_URL) in redirectto:
-            raise CommandError("Received unexpected redirect from %s to '%s' (expected %s)" % (fetchpage, c.getinfo(pycurl.REDIRECT_URL), redirectto))
+            raise CommandError("Received unexpected redirect from %s to '%s' (expected %s)" % (
+                fetchpage, c.getinfo(pycurl.REDIRECT_URL), redirectto))
         return c.getinfo(pycurl.REDIRECT_URL)
 
 
@@ -91,7 +94,9 @@ class Command(BaseCommand):
 
         curl = CurlWrapper()
 
-        if verbose: self.stdout.write("Logging in...")
+        if verbose:
+            self.stdout.write("Logging in...")
+
         curl.expect_redirect('https://www.creditmutuel.fr/en/authentification.html',
                              'https://www.creditmutuel.fr/en/banque/pageaccueil.html', {
                                  '_cm_user': settings.CM_USER_ACCOUNT,
@@ -104,19 +109,23 @@ class Command(BaseCommand):
                              'https://www.creditmutuel.fr/en/banque/paci_engine/engine.aspx')
         got_redir = curl.expect_redirect('https://www.creditmutuel.fr/en/banque/paci_engine/engine.aspx',
                                          ['https://www.creditmutuel.fr/en/banque/homepage_dispatcher.cgi',
-                                         'https://www.creditmutuel.fr/en/banque/paci_engine/static_content_manager.aspx'])
+                                          'https://www.creditmutuel.fr/en/banque/paci_engine/static_content_manager.aspx'])
         if got_redir == 'https://www.creditmutuel.fr/en/banque/paci_engine/static_content_manager.aspx':
             # Got the "please fill out your personal data" form. So let's bypass it
             curl.expect_redirect('https://www.creditmutuel.fr/en/banque/paci_engine/static_content_manager.aspx?_productfilter=PACI&_pid=ContentManager&_fid=DoStopPaciAndRemind',
                                  'https://www.creditmutuel.fr/en/banque/homepage_dispatcher.cgi')
 
         # Download the form
-        if verbose: self.stdout.write("Downloading form...")
-        (c,s) = curl.get('https://www.creditmutuel.fr/cmidf/en/banque/compte/telechargement.cgi')
+        if verbose:
+            self.stdout.write("Downloading form...")
+
+        (c, s) = curl.get('https://www.creditmutuel.fr/cmidf/en/banque/compte/telechargement.cgi')
         if c.getinfo(pycurl.RESPONSE_CODE) != 200:
             raise CommandError("Supposed to receive 200, got %s" % c.getinfo(c.RESPONSE_CODE))
 
-        if verbose: self.stdout.write("Parsing form...")
+        if verbose:
+            self.stdout.write("Parsing form...")
+
         parser = FormHtmlParser()
         parser.feed(s.getvalue())
 
@@ -127,38 +136,40 @@ class Command(BaseCommand):
             fromdate = fromdate['max']-datetime.timedelta(days=7)
         else:
             # No previous one, so just pick a date... This will only happen once..
-            fromdate = datetime.date(2014,1,1)
-
-        if verbose: self.stdout.write("Fetch report since {0}".format(fromdate))
-        (c,s) = curl.post("https://www.creditmutuel.fr%s" % parser.target_url, {
-            'data_formats_selected':'csv',
-            'data_formats_options_cmi_download':'0',
-            'data_formats_options_ofx_format':'7',
-            'Bool:data_formats_options_ofx_zonetiers':'false',
-            'CB:data_formats_options_ofx_zonetiers':'on',
-            'data_formats_options_qif_fileformat':'6',
-            'ata_formats_options_qif_dateformat':'0',
-            'data_formats_options_qif_amountformat':'0',
-            'data_formats_options_qif_headerformat':'0',
-            'Bool:data_formats_options_qif_zonetiers':'false',
-            'CB:data_formats_options_qif_zonetiers':'on',
-            'data_formats_options_csv_fileformat':'2',
-            'data_formats_options_csv_dateformat':'0',
-            'data_formats_options_csv_fieldseparator':'0',
-            'data_formats_options_csv_amountcolnumber':'0',
-            'data_formats_options_csv_decimalseparator':'1',
-            'Bool:data_accounts_account_ischecked':'false',
-            'CB:data_accounts_account_ischecked':'on',
-            'data_daterange_value':'range',
-            '[t:dbt%3adate;]data_daterange_startdate_value':fromdate.strftime('%d/%m/%Y'),
-            '[t:dbt%3adate;]data_daterange_enddate_value':'',
-            '_FID_DoDownload.x':'57',
-            '_FID_DoDownload.y':'17',
-            'data_accounts_selection':'1',
-            'data_formats_options_cmi_show':'True',
-            'data_formats_options_qif_show':'True',
-            'data_formats_options_excel_show':'True',
-            'data_formats_options_csv_show':'True',
+            fromdate = datetime.date(2014, 1, 1)
+
+        if verbose:
+            self.stdout.write("Fetch report since {0}".format(fromdate))
+
+        (c, s) = curl.post("https://www.creditmutuel.fr%s" % parser.target_url, {
+            'data_formats_selected': 'csv',
+            'data_formats_options_cmi_download': '0',
+            'data_formats_options_ofx_format': '7',
+            'Bool:data_formats_options_ofx_zonetiers': 'false',
+            'CB:data_formats_options_ofx_zonetiers': 'on',
+            'data_formats_options_qif_fileformat': '6',
+            'ata_formats_options_qif_dateformat': '0',
+            'data_formats_options_qif_amountformat': '0',
+            'data_formats_options_qif_headerformat': '0',
+            'Bool:data_formats_options_qif_zonetiers': 'false',
+            'CB:data_formats_options_qif_zonetiers': 'on',
+            'data_formats_options_csv_fileformat': '2',
+            'data_formats_options_csv_dateformat': '0',
+            'data_formats_options_csv_fieldseparator': '0',
+            'data_formats_options_csv_amountcolnumber': '0',
+            'data_formats_options_csv_decimalseparator': '1',
+            'Bool:data_accounts_account_ischecked': 'false',
+            'CB:data_accounts_account_ischecked': 'on',
+            'data_daterange_value': 'range',
+            '[t:dbt%3adate;]data_daterange_startdate_value': fromdate.strftime('%d/%m/%Y'),
+            '[t:dbt%3adate;]data_daterange_enddate_value': '',
+            '_FID_DoDownload.x': '57',
+            '_FID_DoDownload.y': '17',
+            'data_accounts_selection': '1',
+            'data_formats_options_cmi_show': 'True',
+            'data_formats_options_qif_show': 'True',
+            'data_formats_options_excel_show': 'True',
+            'data_formats_options_csv_show': 'True',
         })
         if c.getinfo(pycurl.RESPONSE_CODE) != 200:
             raise CommandError("Supposed to receive 200, got %s" % c.getinfo(c.RESPONSE_CODE))

diff --git a/code/pgeusite/cmutuel/models.py b/code/pgeusite/cmutuel/models.py
index c2d7b616fdade977c0cd62338791bda8c30e22d7..cdbd364a0d46226408e3e8c2776b6eedb88c0d69 100644 (file)
--- a/code/pgeusite/cmutuel/models.py
+++ b/code/pgeusite/cmutuel/models.py
@@ -1,5 +1,6 @@
 from django.db import models
 
+
 class CMutuelTransaction(models.Model):
     opdate = models.DateField(null=False, blank=False)
     valdate = models.DateField(null=False, blank=False)
@@ -10,8 +11,8 @@ class CMutuelTransaction(models.Model):
     sent = models.BooleanField(null=False, blank=False, default=False)
 
     class Meta:
-        verbose_name='CMutuel Transaction'
-        verbose_name_plural='CMutuel Transactions'
+        verbose_name = 'CMutuel Transaction'
+        verbose_name_plural = 'CMutuel Transactions'
         ordering = ('-opdate',)
 
     def __unicode__(self):

diff --git a/code/skin_settings.py b/code/skin_settings.py
index 88eb10596b4e8b15ac1d80431489379427d88303..e5ba77aa0143861d42201de38f0ce1b35ef94067 100644 (file)
--- a/code/skin_settings.py
+++ b/code/skin_settings.py
@@ -1,42 +1,42 @@
 import os
 
-SKIN_APPS=[
+SKIN_APPS = [
     'pgeusite.cmutuel',
 ]
 
-SITEBASE="https://www.postgresql.eu"
-ORG_NAME="PostgreSQL Europe"
-ORG_SHORTNAME="PGEU"
+SITEBASE = "https://www.postgresql.eu"
+ORG_NAME = "PostgreSQL Europe"
+ORG_SHORTNAME = "PGEU"
 
 # Modules
-ENABLE_PG_COMMUNITY_AUTH=True
-ENABLE_MEMBERSHIP=True
-ENABLE_ELECTIONS=True
-ENABLE_TRUSTLY=True
-ENABLE_AUTO_ACCOUNTING=True
+ENABLE_PG_COMMUNITY_AUTH = True
+ENABLE_MEMBERSHIP = True
+ENABLE_ELECTIONS = True
+ENABLE_TRUSTLY = True
+ENABLE_AUTO_ACCOUNTING = True
 
 # Emails
-DEFAULT_EMAIL="webmaster@postgresql.eu"
-TREASURER_EMAIL="treasurer@postgresql.eu"
-INVOICE_SENDER_EMAIL="treasurer@postgresql.eu"
-MEMBERSHIP_SENDER_EMAIL="webmaster@postgresql.eu"
+DEFAULT_EMAIL = "webmaster@postgresql.eu"
+TREASURER_EMAIL = "treasurer@postgresql.eu"
+INVOICE_SENDER_EMAIL = "treasurer@postgresql.eu"
+MEMBERSHIP_SENDER_EMAIL = "webmaster@postgresql.eu"
 
 # Ugh
-EU_VAT=True
-EU_VAT_HOME_COUNTRY="FR"
-EU_VAT_VALIDATE=True
+EU_VAT = True
+EU_VAT_HOME_COUNTRY = "FR"
+EU_VAT_VALIDATE = True
 
 # Paypal
-PAYPAL_EMAIL="paypal@postgresql.eu"
-PAYPAL_RECEIVER="paypal@postgresql.eu"
-PAYPAL_DONATION_TEXT="PostgreSQL Europe"
+PAYPAL_EMAIL = "paypal@postgresql.eu"
+PAYPAL_RECEIVER = "paypal@postgresql.eu"
+PAYPAL_DONATION_TEXT = "PostgreSQL Europe"
 
 # CM balance fetching account
-CM_USER_ACCOUNT=None
-CM_USER_PASSWORD=None
+CM_USER_ACCOUNT = None
+CM_USER_PASSWORD = None
 
 # Load trustly keys
 with open(os.path.join(os.path.dirname(__file__), 'trustly_public.pem'), 'r') as f:
-    TRUSTLY_PUBLIC_KEY=f.read()
+    TRUSTLY_PUBLIC_KEY = f.read()
 with open(os.path.join(os.path.dirname(__file__), 'trustly_private.pem'), 'r') as f:
-    TRUSTLY_PRIVATE_KEY=f.read()
+    TRUSTLY_PRIVATE_KEY = f.read()

diff --git a/code/skin_urls.py b/code/skin_urls.py
index f0222893b7c60ea8b3d7cb0087e0c4463caf4ba6..8cd51c73075672206c8d53f40ff9f5eb44899830 100644 (file)
--- a/code/skin_urls.py
+++ b/code/skin_urls.py
@@ -3,8 +3,7 @@ from django.conf.urls import url
 import postgresqleu.static.views
 import postgresqleu.membership.views
 
-PRELOAD_URLS=[
+PRELOAD_URLS = [
     url(r'^(events/services)/$', postgresqleu.static.views.static_fallback),
     url(r'^community/members/$', postgresqleu.membership.views.userlist),
 ]
-