From 614bec41b5306b32b8de20d66f047ff8d6f35256 Mon Sep 17 00:00:00 2001 From: Villiers Strauss Date: Fri, 22 May 2015 15:54:31 +0200 Subject: Fixed #24841 -- Made BaseRangeField.prepare_value() call base_field's prepare_value() --- tests/postgres_tests/test_ranges.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'tests/postgres_tests') diff --git a/tests/postgres_tests/test_ranges.py b/tests/postgres_tests/test_ranges.py index cab7263af2..5ec6dae27b 100644 --- a/tests/postgres_tests/test_ranges.py +++ b/tests/postgres_tests/test_ranges.py @@ -5,7 +5,7 @@ import unittest from django import forms from django.core import exceptions, serializers from django.db import connection -from django.test import TestCase +from django.test import TestCase, override_settings from django.utils import timezone from . import PostgresSQLTestCase @@ -474,6 +474,14 @@ class TestFormField(PostgresSQLTestCase): value = field.clean(['2013-04-09 11:45', '']) self.assertEqual(value, DateTimeTZRange(datetime.datetime(2013, 4, 9, 11, 45), None)) + @override_settings(USE_TZ=True, TIME_ZONE='Africa/Johannesburg') + def test_datetime_prepare_value(self): + field = pg_forms.DateTimeRangeField() + value = field.prepare_value( + DateTimeTZRange(datetime.datetime(2015, 5, 22, 16, 6, 33, tzinfo=timezone.utc), None) + ) + self.assertEqual(value, [datetime.datetime(2015, 5, 22, 18, 6, 33), None]) + def test_model_field_formfield_integer(self): model_field = pg_fields.IntegerRangeField() form_field = model_field.formfield() -- cgit v1.3