Fix #408 for good

feincms · Oct 16, 2014 · 8e7ed81 · 8e7ed81
1 parent e6eadb0
commit 8e7ed81
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/feincms/module/extensions/datepublisher.py b/feincms/module/extensions/datepublisher.py
@@ -20,6 +20,12 @@
 
 from feincms import extensions
 
+try:
+    from pytz import InvalidTimeError
+except ImportError:
+    # Fall back to a catch-all
+    InvalidTimeError = Exception
+
 
 # ------------------------------------------------------------------------
 def format_date(d, if_none=''):
@@ -71,7 +77,10 @@ def datepublisher_response_processor(page, request, response):
     if expires is not None:
         delta = expires - timezone.now()
         delta = int(delta.days * 86400 + delta.seconds)
-        patch_response_headers(response, delta)
+        try:
+            patch_response_headers(response, delta)
+        except InvalidTimeError:  # NonExistentTimeError and AmbiguousTimeError
+            patch_response_headers(response, delta - 7200)
 
 
 # ------------------------------------------------------------------------