Merge pull request #139 from MrWeeble/bug/timefield_should_return_tim…

…e_not_datetime Correct type for TimeField
paulocheque · Jun 15, 2021 · 24fc2c6 · 24fc2c6
2 parents dc4d49d + 4b877e0
commit 24fc2c6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/django_dynamic_fixture/fixture_algorithms/random_fixture.py b/django_dynamic_fixture/fixture_algorithms/random_fixture.py
@@ -85,7 +85,7 @@ def datefield_config(self, field, key):
         return date.today() - timedelta(days=random.randint(1, 36500))
 
     def timefield_config(self, field, key):
-        return now() - timedelta(seconds=random.randint(1, 36500))
+        return (now() - timedelta(seconds=random.randint(1, 36500))).time()
 
     def datetimefield_config(self, field, key):
         return now() - timedelta(seconds=random.randint(1, 36500))

diff --git a/django_dynamic_fixture/fixture_algorithms/sequential_fixture.py b/django_dynamic_fixture/fixture_algorithms/sequential_fixture.py
@@ -118,7 +118,7 @@ def datefield_config(self, field, key):
 
     def timefield_config(self, field, key):
         data = self.get_value(field, key)
-        return now() - timedelta(seconds=data)
+        return (now() - timedelta(seconds=data)).time()
 
     def datetimefield_config(self, field, key):
         data = self.get_value(field, key)

diff --git a/django_dynamic_fixture/fixture_algorithms/tests/abstract_test_generic_fixture.py b/django_dynamic_fixture/fixture_algorithms/tests/abstract_test_generic_fixture.py
@@ -2,7 +2,7 @@
 
 from django.db import models
 
-from datetime import datetime, date
+from datetime import datetime, date, time
 from decimal import Decimal
 import six
 
@@ -43,7 +43,7 @@ def test_boolean(self):
 
     def test_date_time_related(self):
         assert isinstance(self.fixture.generate_data(models.DateField()), date)
-        assert isinstance(self.fixture.generate_data(models.TimeField()), datetime)
+        assert isinstance(self.fixture.generate_data(models.TimeField()), time)
         assert isinstance(self.fixture.generate_data(models.DateTimeField()), datetime)
 
     def test_formatted_strings(self):

diff --git a/django_dynamic_fixture/fixture_algorithms/unique_random_fixture.py b/django_dynamic_fixture/fixture_algorithms/unique_random_fixture.py
@@ -141,7 +141,7 @@ def datefield_config(self, field, key):
 
     def timefield_config(self, field, key):
         integer = self.random_integer(field, key, signed=False)
-        return now() - timedelta(seconds=integer)
+        return (now() - timedelta(seconds=integer)).time()
 
     def datetimefield_config(self, field, key):
         integer = self.random_integer(field, key, signed=False)

diff --git a/django_dynamic_fixture/tests/test_ddf.py b/django_dynamic_fixture/tests/test_ddf.py
@@ -68,7 +68,7 @@ def test_new_fill_boolean_fields_with_False_and_None(self):
     def test_new_fill_time_related_fields_with_current_values(self):
         instance = self.ddf.new(ModelWithDateTimes)
         assert date.today() >= instance.date
-        assert datetime.now() >= instance.time
+        assert datetime.now().time() >= instance.time
         assert datetime.now() >= instance.datetime
 
     def test_new_fill_formatted_strings_fields_with_basic_values(self):