Ticket #17343: tz.diff

django/template/defaulttags.py

@@ -2 +2 @@
 
 import sys
 import re
-from datetime import datetime
+from django.utils import timezone
 from itertools import groupby, cycle as itertools_cycle
 
 from django.conf import settings
@@ -343 +343 @@
         self.format_string = format_string
 
     def render(self, context):
-        return date(datetime.now(), self.format_string)
+        return date(timezone.localtime(timezone.now()), self.format_string)
 
 class SpacelessNode(Node):
     def __init__(self, nodelist):

tests/regressiontests/templates/tests.py

@@ -504 +504 @@
         self.assertEqual(failures, [], "Tests failed:\n%s\n%s" %
             ('-'*70, ("\n%s\n" % ('-'*70)).join(failures)))
 
+    @override_settings(USE_TZ=True, TIME_ZONE='America/Chicago')
+    def test_now_uses_time_zones(self):
+        from django.utils import timezone
+        with timezone.override('Europe/Warsaw'):
+            template_time = Template('{% now "H:i:s" %}').render(Context())
+            code_time = timezone.localtime(timezone.now()).strftime('%H:%M:%S')
+            self.assertEqual(template_time, code_time)
+
+    @override_settings(USE_TZ=True, TIME_ZONE='America/Chicago')
+    def test_now_uses_time_zones_and_honors_timezone_tag(self):
+        from django.utils import timezone
+        with timezone.override('Europe/Warsaw'):
+            template_time = Template("""{% load tz %}{% timezone "UTC" %}{% now "H:i:s" %}{% endtimezone %}""").render(Context())
+            code_time = timezone.now().strftime('%H:%M:%S')
+            self.assertEqual(template_time, code_time)
+
+    @override_settings(USE_TZ=True, TIME_ZONE='America/Chicago')
+    def test_now_uses_time_zones_and_honors_localtime_tag(self):
+        from django.utils import timezone
+        template_time = Template('{% load tz %}{% localtime off %}{% now "H:i:s" %}{% endlocaltime %}').render(Context())
+        code_time = timezone.now().astimezone(timezone.get_default_timezone()).strftime('%H:%M:%S')
+        self.assertEqual(template_time, code_time)
+
     def render(self, test_template, vals):
         context = template.Context(vals[1])
         before_stack_size = len(context.dicts)