symposion_app Changeset - 39b556b7ac4f

Changeset - 39b556b7ac4f

Parent rev.

Child rev.

[Not reviewed]

0 14 0

Sachi King - 7 years ago 2017-03-31 00:54:46
nakato@nakato.io

Mass style-check update

Seems okay.

14 files changed with 138 insertions and 115 deletions:

pinaxcon/csrf_view.py

pinaxcon/disable_cscache.py

pinaxcon/monkey_patch.py

pinaxcon/proposals/admin.py

pinaxcon/proposals/forms.py

pinaxcon/proposals/models.py

pinaxcon/registrasion/forms.py

pinaxcon/registrasion/management/commands/populate_inventory.py

pinaxcon/registrasion/views.py

pinaxcon/settings.py

pinaxcon/templatetags/lca2017_tags.py

pinaxcon/templatetags/pyconau2017_tags.py

pinaxcon/urls.py

pinaxcon/widgets.py

0 comments (0 inline, 0 general)

pinaxcon/csrf_view.py

➞

Show inline comments

@@ ... / @@ -2,3 +2,2 @@ from django.conf import settings @@
 from django.http import HttpResponseForbidden
 from django.shortcuts import redirect
 from django.template import Context, RequestContext, loader
@@ ... / @@ -7,2 +6,3 @@ from django.utils.version import get_docs_version @@
 def csrf_failure(request, reason=""):

pinaxcon/disable_cscache.py

➞

Show inline comments

...		@@ -2,2 +2,3 @@ from django.utils.cache import add_never_cache_headers


		class DisableClientSideCachingMiddleware(object):
...		@@ -6,2 +7 @@ class DisableClientSideCachingMiddleware(object):
		return response

pinaxcon/monkey_patch.py

➞

Show inline comments

 from django.conf import settings
 from django.core.mail import EmailMultiAlternatives
+from django.core.mail import EmailMultiAlternatives  # noqa: F401
 from functools import wraps
@@ ... / @@ -21,3 +21,3 @@ def do_monkey_patch(): @@
     global do_monkey_patch
     do_monkey_patch = lambda: None
+    do_monkey_patch = lambda: None  # noqa: E731
@@ ... / @@ -36,3 +36,3 @@ def patch_speaker_profile_form(): @@
 def patch_mail_to_send_bcc():
+def patch_mail_to_send_bcc():  # noqa: C901
     ''' Patches django.core.mail's message classes to send a BCC e-mail to
@@ ... / @@ -82,3 +82,2 @@ def patch_mail_to_send_bcc(): @@
     def patch_bcc_keyword(f, k):
@@ ... / @@ -141,2 +140,3 @@ def fix_sitetree_check_access_500s(): @@
 def never_cache_login_page():
@@ ... / @@ -147,3 +147,3 @@ def never_cache_login_page(): @@
 def patch_stripe_payment_form():
+def patch_stripe_payment_form():  # noqa: C901

pinaxcon/proposals/admin.py

➞

Show inline comments

...		@@ -20,3 +20,2 @@ from symposion.proposals import models as symposion_models
		@admin.register(models.OpenHardwareProposal)

		class CategoryAdmin(admin.ModelAdmin):

pinaxcon/proposals/forms.py

➞

Show inline comments

@@ ... / @@ -10,2 +10,3 @@ from .models import KnowledgeProposal @@
 class ProposalForm(forms.ModelForm):
@@ ... / @@ -39,5 +40,5 @@ class TalkProposalForm(ProposalForm): @@
         widgets = {
             "abstract" : widgets.AceMarkdownEditor(),
             "private_abstract" : widgets.AceMarkdownEditor(),
             "technical_requirements" : widgets.AceMarkdownEditor(),
             "abstract": widgets.AceMarkdownEditor(),
             "private_abstract": widgets.AceMarkdownEditor(),
             "technical_requirements": widgets.AceMarkdownEditor(),
+        }
@@ ... / @@ -63,5 +64,5 @@ class TutorialProposalForm(ProposalForm): @@
         widgets = {
             "abstract" : widgets.AceMarkdownEditor(),
             "private_abstract" : widgets.AceMarkdownEditor(),
             "technical_requirements" : widgets.AceMarkdownEditor(),
             "abstract": widgets.AceMarkdownEditor(),
             "private_abstract": widgets.AceMarkdownEditor(),
             "technical_requirements": widgets.AceMarkdownEditor(),
+        }
@@ ... / @@ -81,7 +82,8 @@ class MiniconfProposalForm(ProposalForm): @@
         widgets = {
             "abstract" : widgets.AceMarkdownEditor(),
             "private_abstract" : widgets.AceMarkdownEditor(),
             "technical_requirements" : widgets.AceMarkdownEditor(),
             "abstract": widgets.AceMarkdownEditor(),
             "private_abstract": widgets.AceMarkdownEditor(),
             "technical_requirements": widgets.AceMarkdownEditor(),
+        }
 class SysAdminProposalForm(ProposalForm):
@@ ... / @@ -93,3 +95,3 @@ class SysAdminProposalForm(ProposalForm): @@
             "talk_format",
-            "target_audience",
+            "target_audience",
             "abstract",
@@ ... / @@ -104,7 +106,8 @@ class SysAdminProposalForm(ProposalForm): @@
         widgets = {
             "abstract" : widgets.AceMarkdownEditor(),
             "private_abstract" : widgets.AceMarkdownEditor(),
             "technical_requirements" : widgets.AceMarkdownEditor(),
             "abstract": widgets.AceMarkdownEditor(),
             "private_abstract": widgets.AceMarkdownEditor(),
             "technical_requirements": widgets.AceMarkdownEditor(),
+        }
 class WriteTheDocsProposalForm(ProposalForm):
@@ ... / @@ -116,3 +119,3 @@ class WriteTheDocsProposalForm(ProposalForm): @@
             "talk_format",
-            "target_audience",
+            "target_audience",
             "abstract",
@@ ... / @@ -127,7 +130,8 @@ class WriteTheDocsProposalForm(ProposalForm): @@
         widgets = {
             "abstract" : widgets.AceMarkdownEditor(),
             "private_abstract" : widgets.AceMarkdownEditor(),
             "technical_requirements" : widgets.AceMarkdownEditor(),
             "abstract": widgets.AceMarkdownEditor(),
             "private_abstract": widgets.AceMarkdownEditor(),
             "technical_requirements": widgets.AceMarkdownEditor(),
+        }
 class RadioProposalForm(ProposalForm):
@@ ... / @@ -138,3 +142,3 @@ class RadioProposalForm(ProposalForm): @@
             "title",
-            "target_audience",
+            "target_audience",
             "abstract",
@@ ... / @@ -149,7 +153,8 @@ class RadioProposalForm(ProposalForm): @@
         widgets = {
             "abstract" : widgets.AceMarkdownEditor(),
             "private_abstract" : widgets.AceMarkdownEditor(),
             "technical_requirements" : widgets.AceMarkdownEditor(),
             "abstract": widgets.AceMarkdownEditor(),
             "private_abstract": widgets.AceMarkdownEditor(),
             "technical_requirements": widgets.AceMarkdownEditor(),
+        }
 class KernelProposalForm(ProposalForm):
@@ ... / @@ -160,3 +165,3 @@ class KernelProposalForm(ProposalForm): @@
             "title",
-            "target_audience",
+            "target_audience",
             "abstract",
@@ ... / @@ -171,7 +176,8 @@ class KernelProposalForm(ProposalForm): @@
         widgets = {
             "abstract" : widgets.AceMarkdownEditor(),
             "private_abstract" : widgets.AceMarkdownEditor(),
             "technical_requirements" : widgets.AceMarkdownEditor(),
             "abstract": widgets.AceMarkdownEditor(),
             "private_abstract": widgets.AceMarkdownEditor(),
             "technical_requirements": widgets.AceMarkdownEditor(),
+        }
 class WootconfProposalForm(ProposalForm):
@@ ... / @@ -182,3 +188,3 @@ class WootconfProposalForm(ProposalForm): @@
             "title",
-            "target_audience",
+            "target_audience",
             "abstract",
@@ ... / @@ -193,7 +199,8 @@ class WootconfProposalForm(ProposalForm): @@
         widgets = {
             "abstract" : widgets.AceMarkdownEditor(),
             "private_abstract" : widgets.AceMarkdownEditor(),
             "technical_requirements" : widgets.AceMarkdownEditor(),
             "abstract": widgets.AceMarkdownEditor(),
             "private_abstract": widgets.AceMarkdownEditor(),
             "technical_requirements": widgets.AceMarkdownEditor(),
+        }
 class SecurityProposalForm(ProposalForm):
@@ ... / @@ -204,3 +211,3 @@ class SecurityProposalForm(ProposalForm): @@
             "title",
-            "target_audience",
+            "target_audience",
             "abstract",
@@ ... / @@ -215,7 +222,8 @@ class SecurityProposalForm(ProposalForm): @@
         widgets = {
             "abstract" : widgets.AceMarkdownEditor(),
             "private_abstract" : widgets.AceMarkdownEditor(),
             "technical_requirements" : widgets.AceMarkdownEditor(),
             "abstract": widgets.AceMarkdownEditor(),
             "private_abstract": widgets.AceMarkdownEditor(),
             "technical_requirements": widgets.AceMarkdownEditor(),
+        }
 class GamesProposalForm(ProposalForm):
@@ ... / @@ -227,3 +235,3 @@ class GamesProposalForm(ProposalForm): @@
             "talk_format",
-            "target_audience",
+            "target_audience",
             "abstract",
@@ ... / @@ -238,7 +246,8 @@ class GamesProposalForm(ProposalForm): @@
         widgets = {
             "abstract" : widgets.AceMarkdownEditor(),
             "private_abstract" : widgets.AceMarkdownEditor(),
             "technical_requirements" : widgets.AceMarkdownEditor(),
             "abstract": widgets.AceMarkdownEditor(),
             "private_abstract": widgets.AceMarkdownEditor(),
             "technical_requirements": widgets.AceMarkdownEditor(),
+        }
 class TestingProposalForm(ProposalForm):
@@ ... / @@ -249,3 +258,3 @@ class TestingProposalForm(ProposalForm): @@
             "title",
-            "target_audience",
+            "target_audience",
             "abstract",
@@ ... / @@ -260,7 +269,8 @@ class TestingProposalForm(ProposalForm): @@
         widgets = {
             "abstract" : widgets.AceMarkdownEditor(),
             "private_abstract" : widgets.AceMarkdownEditor(),
             "technical_requirements" : widgets.AceMarkdownEditor(),
             "abstract": widgets.AceMarkdownEditor(),
             "private_abstract": widgets.AceMarkdownEditor(),
             "technical_requirements": widgets.AceMarkdownEditor(),
+        }
 class KnowledgeProposalForm(ProposalForm):
@@ ... / @@ -271,3 +281,3 @@ class KnowledgeProposalForm(ProposalForm): @@
             "title",
-            "target_audience",
+            "target_audience",
             "abstract",
@@ ... / @@ -282,7 +292,8 @@ class KnowledgeProposalForm(ProposalForm): @@
         widgets = {
             "abstract" : widgets.AceMarkdownEditor(),
             "private_abstract" : widgets.AceMarkdownEditor(),
             "technical_requirements" : widgets.AceMarkdownEditor(),
             "abstract": widgets.AceMarkdownEditor(),
             "private_abstract": widgets.AceMarkdownEditor(),
             "technical_requirements": widgets.AceMarkdownEditor(),
+        }
 class LawProposalForm(ProposalForm):
@@ ... / @@ -293,3 +304,3 @@ class LawProposalForm(ProposalForm): @@
             "title",
-            "target_audience",
+            "target_audience",
             "abstract",
@@ ... / @@ -304,7 +315,8 @@ class LawProposalForm(ProposalForm): @@
         widgets = {
             "abstract" : widgets.AceMarkdownEditor(),
             "private_abstract" : widgets.AceMarkdownEditor(),
             "technical_requirements" : widgets.AceMarkdownEditor(),
             "abstract": widgets.AceMarkdownEditor(),
             "private_abstract": widgets.AceMarkdownEditor(),
             "technical_requirements": widgets.AceMarkdownEditor(),
+        }
 class OpenHardwareProposalForm(ProposalForm):
@@ ... / @@ -316,3 +328,3 @@ class OpenHardwareProposalForm(ProposalForm): @@
             "talk_format",
-            "target_audience",
+            "target_audience",
             "abstract",
@@ ... / @@ -327,5 +339,5 @@ class OpenHardwareProposalForm(ProposalForm): @@
         widgets = {
             "abstract" : widgets.AceMarkdownEditor(),
             "private_abstract" : widgets.AceMarkdownEditor(),
             "technical_requirements" : widgets.AceMarkdownEditor(),
             "abstract": widgets.AceMarkdownEditor(),
             "private_abstract": widgets.AceMarkdownEditor(),
             "technical_requirements": widgets.AceMarkdownEditor(),
+        }

pinaxcon/proposals/models.py

➞

Show inline comments

@@ ... / @@ -47,2 +47,3 @@ class TalkProposal(Proposal): @@
 class TutorialProposal(Proposal):
@@ ... / @@ -52,2 +53,3 @@ class TutorialProposal(Proposal): @@
 class MiniconfProposal(ProposalBase):
@@ ... / @@ -57,2 +59,3 @@ class MiniconfProposal(ProposalBase): @@
 class SysAdminProposal(Proposal):
@@ ... / @@ -61,3 +64,3 @@ class SysAdminProposal(Proposal): @@
     TYPE_LIGHTNING_TALK = 2
     TALK_FORMATS = [
@@ ... / @@ -66,6 +69,7 @@ class SysAdminProposal(Proposal): @@
+    ]
     talk_format = models.IntegerField(choices=TALK_FORMATS,
     talk_format = models.IntegerField(
         choices=TALK_FORMATS,
         help_text="Please indicate your preferred talk length in the private abstract field below.")
     class Meta:
@@ ... / @@ -73,14 +77,15 @@ class SysAdminProposal(Proposal): @@
 class WriteTheDocsProposal(Proposal):
-    TYPE_LONG_PRESENTATION = 1
+    TYPE_LONG_PRESENTATION = 1
     TYPE_SHORT_PRESENTATION = 2
     TALK_FORMATS = [
-        (TYPE_LONG_PRESENTATION, "Long Presentation (40 min)"),
+        (TYPE_LONG_PRESENTATION, "Long Presentation (40 min)"),
         (TYPE_SHORT_PRESENTATION, "Short Presentation (20 min)"),
+    ]
     talk_format = models.IntegerField(choices=TALK_FORMATS)
     class Meta:
@@ ... / @@ -88,2 +93,3 @@ class WriteTheDocsProposal(Proposal): @@
 class OpenRadioProposal(Proposal):
@@ ... / @@ -93,2 +99,3 @@ class OpenRadioProposal(Proposal): @@
 class WootconfProposal(Proposal):
@@ ... / @@ -98,2 +105,3 @@ class WootconfProposal(Proposal): @@
 class KernelProposal(Proposal):
@@ ... / @@ -103,2 +111,3 @@ class KernelProposal(Proposal): @@
 class SecurityProposal(Proposal):
@@ ... / @@ -108,2 +117,3 @@ class SecurityProposal(Proposal): @@
 class GamesProposal(Proposal):
@@ ... / @@ -119,5 +129,5 @@ class GamesProposal(Proposal): @@
+    ]
     talk_format = models.IntegerField(choices=TALK_FORMATS)
     class Meta:
@@ ... / @@ -125,2 +135,3 @@ class GamesProposal(Proposal): @@
 class TestingProposal(Proposal):
@@ ... / @@ -130,2 +141,3 @@ class TestingProposal(Proposal): @@
 class KnowledgeProposal(Proposal):
@@ ... / @@ -135,2 +147,3 @@ class KnowledgeProposal(Proposal): @@
 class LawProposal(Proposal):
@@ ... / @@ -140,14 +153,15 @@ class LawProposal(Proposal): @@
 class OpenHardwareProposal(Proposal):
-    TYPE_NORMAL_PRESENTATION = 1
+    TYPE_NORMAL_PRESENTATION = 1
     TYPE_LIGHTNING_TALK = 2
     TALK_FORMATS = [
-        (TYPE_NORMAL_PRESENTATION, "Presentation (20 min)"),
+        (TYPE_NORMAL_PRESENTATION, "Presentation (20 min)"),
         (TYPE_LIGHTNING_TALK, "Lightning Talk (5 min)"),
+    ]
     talk_format = models.IntegerField(choices=TALK_FORMATS)
     class Meta:

pinaxcon/registrasion/forms.py

➞

Show inline comments

@@ ... / @@ -10,3 +10,3 @@ class YesNoField(forms.TypedChoiceField): @@
             *a,
             coerce=lambda x: x =='True',
+            coerce=lambda x: x == 'True',
             choices=((False, 'No'), (True, 'Yes')),
@@ ... / @@ -24,9 +24,8 @@ class ProfileForm(forms.ModelForm): @@
         field_classes = {
-            "of_legal_age" : YesNoField,
             "of_legal_age": YesNoField,
+        }
         widgets = {
-            "past_lca" : forms.widgets.CheckboxSelectMultiple(),
             "past_lca": forms.widgets.CheckboxSelectMultiple(),
+        }
     class Media:

pinaxcon/registrasion/management/commands/populate_inventory.py

➞

Show inline comments

@@ ... / @@ -6,3 +6,3 @@ from django.contrib.auth.models import Group @@
 from django.core.exceptions import ObjectDoesNotExist
-from django.core.management.base import BaseCommand, CommandError
 from django.core.management.base import BaseCommand
@@ ... / @@ -12,3 +12,5 @@ from symposion import proposals @@
 class Command(BaseCommand):
     help = 'Populates the inventory with the LCA2017 inventory model'
@@ ... / @@ -57,3 +59,3 @@ class Command(BaseCommand): @@
                         "[LINK]registration details page.[/LINK]",
-            required = True,
             required=True,
             render_type=inv.Category.RENDER_TYPE_RADIO,
@@ ... / @@ -70,3 +72,3 @@ class Command(BaseCommand): @@
                         "included in your conference ticket price.",
-            required = False,
             required=False,
             render_type=inv.Category.RENDER_TYPE_QUANTITY,
@@ ... / @@ -83,3 +85,3 @@ class Command(BaseCommand): @@
                         "family members.",
-            required = False,
             required=False,
             render_type=inv.Category.RENDER_TYPE_QUANTITY,
@@ ... / @@ -97,3 +99,3 @@ class Command(BaseCommand): @@
                         "guests.",
-            required = False,
             required=False,
             render_type=inv.Category.RENDER_TYPE_RADIO,
@@ ... / @@ -108,3 +110,3 @@ class Command(BaseCommand): @@
                         "linux.conf.au 2017 artwork.",
-            required = False,
             required=False,
             render_type=inv.Category.RENDER_TYPE_ITEM_QUANTITY,
@@ ... / @@ -126,3 +128,3 @@ class Command(BaseCommand): @@
                         "accommodation page.[/LINK]",
-            required = False,
             required=False,
             render_type=inv.Category.RENDER_TYPE_RADIO,
@@ ... / @@ -137,3 +139,3 @@ class Command(BaseCommand): @@
                         "experience.",
-            required = False,
             required=False,
             render_type=inv.Category.RENDER_TYPE_QUANTITY,

pinaxcon/registrasion/views.py

➞

Show inline comments

 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.contrib import messages
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.exceptions import ValidationError
@@ ... / @@ -8,3 +5,2 @@ from django.shortcuts import get_object_or_404 @@
 from django.shortcuts import redirect
 from django.shortcuts import render
@@ ... / @@ -20,3 +16,3 @@ def demopay(request, invoice_id, access_code): @@
     invoice_id = int(invoice_id)
     inv = get_object_or_404(rego.Invoice.objects,pk=invoice_id)
+    inv = get_object_or_404(rego.Invoice.objects, pk=invoice_id)

pinaxcon/settings.py

➞

Show inline comments

 import os
 import dj_database_url
 from django.utils.crypto import get_random_string
@@ ... / @@ -9,3 +8,3 @@ BASE_DIR = PACKAGE_ROOT @@
 DEBUG = True #bool(int(os.environ.get("DEBUG", "1")))
+DEBUG = True  # bool(int(os.environ.get("DEBUG", "1")))
@@ ... / @@ -154,3 +153,3 @@ INSTALLED_APPS = [ @@
     #admin - required by registrasion ??
+    # admin - required by registrasion ??
     "nested_admin",
@@ ... / @@ -165,3 +164,3 @@ INSTALLED_APPS = [ @@
     #testing
+    # testing
     "django_nose",
@@ ... / @@ -206,3 +205,3 @@ LOGGING = { @@
     'handlers': {
-         'console':{
+        'console': {
             'level': 'DEBUG',
@@ ... / @@ -275,4 +274,4 @@ PROPOSAL_FORMS = { @@
 #PINAX_PAGES_HOOKSET = "pinaxcon.hooks.PinaxPagesHookSet"
 #PINAX_BOXES_HOOKSET = "pinaxcon.hooks.PinaxBoxesHookSet"
 # PINAX_PAGES_HOOKSET = "pinaxcon.hooks.PinaxPagesHookSet"
 # PINAX_BOXES_HOOKSET = "pinaxcon.hooks.PinaxBoxesHookSet"
@@ ... / @@ -310,3 +309,3 @@ except NameError: @@
     try:
         from local_settings import *
+        from local_settings import *  # noqa: F401,F403
     except ImportError:

pinaxcon/templatetags/lca2017_tags.py

➞

Show inline comments

@@ ... / @@ -2,3 +2,2 @@ import cms_pages @@
 import hashlib
 import urllib
@@ ... / @@ -57,3 +56,5 @@ def speaker_photo(context, speaker, size): @@
         md5sum = hashlib.md5(email.strip().lower()).hexdigest()
         url = "https://secure.gravatar.com/avatar/%s?s=%d&d=%s" % (md5sum, size, "https://linux.conf.au/site_media/static/lca2017/images/speaker-fallback-devil.jpg")
         fallback_image = ("https://linux.conf.au/site_media/static/lca2017"
                           "/images/speaker-fallback-devil.jpg")
         url = "https://secure.gravatar.com/avatar/%s?s=%d&d=%s" % (md5sum, size, fallback_image)
@@ ... / @@ -96,2 +97,3 @@ def conference_name(): @@
 @register.filter()

pinaxcon/templatetags/pyconau2017_tags.py

➞

Show inline comments

@@ ... / @@ -2,3 +2,2 @@ import cms_pages @@
 import hashlib
 import urllib
@@ ... / @@ -59,3 +58,5 @@ def speaker_photo(context, speaker, size): @@
         md5sum = hashlib.md5(email.strip().lower()).hexdigest()
         url = "https://secure.gravatar.com/avatar/%s?s=%d&d=%s" % (md5sum, size, "https://2017.pycon-au.org/site_media/static/pyconau23017/images/speaker-fallback-devil.jpg")
         fallback_image = ("https://2017.pycon-au.org/site_media/static"
                           "/pyconau23017/images/speaker-fallback-devil.jpg")
         url = "https://secure.gravatar.com/avatar/%s?s=%d&d=%s" % (md5sum, size, fallback_image)
@@ ... / @@ -98,2 +99,3 @@ def conference_name(): @@
 @register.filter()
@@ ... / @@ -106,2 +108,3 @@ def trackname(room, day): @@
 @register.simple_tag()
@@ ... / @@ -112,3 +115,2 @@ def sponsor_thumbnail(sponsor_logo): @@
             return logo_file
     return ""
@@ ... / \ No newline at end of file @@
     return ""

pinaxcon/urls.py

➞

Show inline comments

 from django.conf import settings
-from django.conf.urls import patterns, include, url
 from django.conf.urls import include, url
 from django.conf.urls.static import static
@@ ... / @@ -13,5 +13,2 @@ import symposion.views @@
 import sys
 urlpatterns = [
@@ ... / @@ -48,3 +45,3 @@ urlpatterns = [ @@
     # Demo payment gateway and related features
     #url(r"^register/pinaxcon/", include("pinaxcon.registrasion.urls")),
+    # url(r"^register/pinaxcon/", include("pinaxcon.registrasion.urls")),
@@ ... / @@ -53,4 +50,4 @@ urlpatterns = [ @@
 if settings.DEBUG:
    import debug_toolbar
    urlpatterns.insert(0, url(r'^__debug__/', include(debug_toolbar.urls)))
     import debug_toolbar
     urlpatterns.insert(0, url(r'^__debug__/', include(debug_toolbar.urls)))

pinaxcon/widgets.py

➞

Show inline comments

...		@@ -2,2 +2,3 @@ from django import forms


		class AceMarkdownEditor(forms.Textarea):

0 comments (0 inline, 0 general)