From 5e44c7239dcb89fe0e46bfcd6e3e1238c4664218 Mon Sep 17 00:00:00 2001 From: William Fagan Date: Thu, 23 Jun 2011 15:40:30 -0500 Subject: [PATCH] Various pep8 fixes. --- forms.py | 22 +++++++++++----------- templates/base.html | 1 + urls.py | 11 ++++++----- views.py | 11 +++++------ 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/forms.py b/forms.py index 5fd24d2..1ba9b87 100644 --- a/forms.py +++ b/forms.py @@ -1,43 +1,43 @@ from django import forms from django.core.mail.backends.dummy import EmailBackend as DummyEmailBackend -from django.core.mail.backends.smtp import EmailBackend as SmtpEmailBackend -from django.core.mail import send_mail, BadHeaderError, EmailMessage, get_connection +from django.core.mail import BadHeaderError, EmailMessage, get_connection import settings + class ContactForm(forms.Form): name = forms.CharField() email = forms.EmailField() phone_number = forms.CharField(required=False) company = forms.CharField(required=False) message = forms.CharField(widget=forms.widgets.Textarea()) - + def clean(self): try: self.send_mail(DummyEmailBackend()) except BadHeaderError: raise forms.ValidationError('Invalid header found.') - + return self.cleaned_data - + def send_mail(self, connection=None): name = self.cleaned_data.get('name', None) email = self.cleaned_data.get('email') phone_number = self.cleaned_data.get('phone_number') company = self.cleaned_data.get('company') message = self.cleaned_data.get('message') - + if name and company: subject = 'Contact: {0} ({1})'.format(name, company) else: subject = 'Contact: {0}'.format(name) - + body = '{0}\n\n{1}'.format(message, name) - + if (phone_number): body = '{0}\n{1}'.format(body, phone_number) - + connection = connection or get_connection() - - EmailMessage(subject, body, email, zip(*settings.MANAGERS)[1], + + EmailMessage(subject, body, email, zip(*settings.MANAGERS)[1], connection=connection).send() diff --git a/templates/base.html b/templates/base.html index 1cba7ec..e9f6752 100644 --- a/templates/base.html +++ b/templates/base.html @@ -5,6 +5,7 @@ Wichita Code | {% block title %}{% endblock %} +