Merge remote-tracking branch 'origin/master' into wednesday-cleanup

pinaxcon/settings.py

@@ -25,6 +25,11 @@ DATABASES['default'].update(db_from_env)
 ALLOWED_HOSTS = [".localhost", ".herokuapp.com", ".northbaypython.org"]
 CANONICAL_HOST = os.environ.get("DJANGO_CANONICAL_HOST", None)
 
+# If DEFAULT_FROM_EMAIL is not set, email will most likely break in prod.
+from_email = os.environ.get("DJANGO_DEFAULT_FROM_EMAIL", None)
+if from_email is not None:
+    DEFAULT_FROM_EMAIL = from_email
+
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.

pinaxcon/templates/_footer.html

@@ -8,7 +8,7 @@
   </div>
 
   <div class="footer-copy">
-    <p>&copy; 2017 North Bay Python, a member project of <a href="https://sfconservancy.org" >Software Freedom Conservancy</a>, a 501(c)(3) charity.</p>
+    <p>&copy; 2017 North Bay Python, member project of <a href="https://sfconservancy.org" >Software Freedom Conservancy</a>, a 501(c)(3) charity.</p>
 
     <p>
       <a href="https://facebook.com/northbaypython">Facebook</a>

pinaxcon/urls.py

@@ -5,9 +5,10 @@ from django.contrib.staticfiles.templatetags.staticfiles import static as _stati
 from django.views.generic import TemplateView
 from django.views.generic import RedirectView
 
-
 from django.contrib import admin
 
+from pinaxcon import views
+
 import symposion.views
 
 
@@ -78,3 +79,5 @@ urlpatterns = [
 ]
 
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+
+handler500 = views.server_error

pinaxcon/views.py

@@ -0,0 +1,9 @@
+from django.http import HttpResponseServerError
+from django.template import RequestContext
+from django.template import Template
+from django.template.loader import get_template
+from django.views import defaults
+
+def server_error(request, template_name=defaults.ERROR_500_TEMPLATE_NAME):
+    t = Template("{%% include '%s' %%}" % template_name)
+    return HttpResponseServerError(t.render(RequestContext(request)))