Context Navigation

Ticket #22598: timezone.diff

File timezone.diff, 943 bytes (added by trott@…, 11 years ago)
patch for utils/timezone.py

diff -r c1387e7748f1 .DS_Store
Binary file .DS_Store has changed
diff -r c1387e7748f1 Django-1.5.5/django/utils/timezone.py

-              a
     """
     if hasattr(timezone, 'localize'):
         # available for pytz time zones
+        return timezone.localize(value, is_dst=None)
+        #return timezone.localize(value, is_dst=None)
+        # TRott: may throw AmbiguousTimeError (eg. 2013-10-27 02:05:35)
+        try:
+            return timezone.localize(value, is_dst=None)
+        except pytz.AmbiguousTimeError:
+            return timezone.localize(value, is_dst=False)
+        except pytz.NonExistentTimeError:
+            return timezone.localize(value, is_dst=False)
     else:
         # may be wrong around DST changes
         return value.replace(tzinfo=timezone)