Ticket #568: config_mod.diff

conf/global_settings.py

@@ -67 +67 @@
 # the site managers.
 DEFAULT_FROM_EMAIL = 'webmaster@localhost'
 
+# This is the string that prefixes the admin and manager email messages
+EMAIL_IDENT = "[Django]"
+
 # Whether to append trailing slashes to URLs.
 APPEND_SLASH = True
 
@@ -167 +170 @@
 # URL that handles the media served from MEDIA_ROOT.
 # Example: "http://media.lawrence.com"
 MEDIA_URL = ''
+
+# This is the path to the JING executable
+JING = '/usr/bin/jing'

core/defaulttags.py

@@ -219 +219 @@
             try:
                 t = template.Template(output)
                 return t.render(context)
-            except template.TemplateSyntaxError:
+            except template.TemplateSyntaxError,e:
+                raise e
                 return '' # Fail silently for invalid included templates.
         return output
 

core/validators.py

@@ -23 +23 @@
 phone_re = re.compile(r'^[A-PR-Y0-9]{3}-[A-PR-Y0-9]{3}-[A-PR-Y0-9]{4}$', re.IGNORECASE)
 url_re = re.compile(r'^http://\S+$')
 
-JING = '/usr/bin/jing'
+from django.conf.settings import JING
 
 class ValidationError(Exception):
     def __init__(self, message):
@@ -211 +211 @@
     catch 'motherfucker' as well. Raises a ValidationError such as:
         Watch your mouth! The words "f--k" and "s--t" are not allowed here.
     """
-    bad_words = ['asshat', 'asshead', 'asshole', 'cunt', 'fuck', 'gook', 'nigger', 'shit'] # all in lower case
+    bad_words = ['asshat', 'asshead', 'asshole', 'cunt', 'fuck', 'gook', 'nigger', 'shit','assclown'] # all in lower case
     field_data = field_data.lower() # normalize
     words_seen = [w for w in bad_words if field_data.find(w) > -1]
     if words_seen:

core/mail.py

@@ -1 +1 @@
 # Use this module for e-mailing.
 
-from django.conf.settings import DEFAULT_FROM_EMAIL, EMAIL_HOST
+from django.conf.settings import DEFAULT_FROM_EMAIL, EMAIL_HOST, EMAIL_IDENT
 from email.MIMEText import MIMEText
+
 import smtplib
 
 def send_mail(subject, message, from_email, recipient_list, fail_silently=False):
@@ -41 +42 @@
 def mail_admins(subject, message, fail_silently=False):
     "Sends a message to the admins, as defined by the ADMINS constant in settings.py."
     from django.conf.settings import ADMINS, SERVER_EMAIL
-    send_mail('[Django] ' + subject, message, SERVER_EMAIL, [a[1] for a in ADMINS], fail_silently)
+    send_mail(EMAIL_IDENT + ' ' + subject, message, SERVER_EMAIL, [a[1] for a in ADMINS], fail_silently)
 
 def mail_managers(subject, message, fail_silently=False):
     "Sends a message to the managers, as defined by the MANAGERS constant in settings.py"
     from django.conf.settings import MANAGERS, SERVER_EMAIL
-    send_mail('[Django] ' + subject, message, SERVER_EMAIL, [a[1] for a in MANAGERS], fail_silently)
+    send_mail(EMAIL_IDENT + ' ' + subject, message, SERVER_EMAIL, [a[1] for a in MANAGERS], fail_silently)