Ticket #21565: 21565.diff

django/contrib/gis/tests/relatedapp/models.py

@@ -71 +71 @@
 class Book(SimpleModel):
     title = models.CharField(max_length=100)
     author = models.ForeignKey(Author, related_name='books', null=True)
+
+
+class Event(SimpleModel):
+    name = models.CharField(max_length=100)
+    when = models.DateTimeField()

django/contrib/gis/tests/relatedapp/tests.py

@@ -5 +5 @@
 from django.contrib.gis.geos import HAS_GEOS
 from django.contrib.gis.tests.utils import HAS_SPATIAL_DB, mysql, oracle, no_mysql, no_oracle, no_spatialite
 from django.test import TestCase
+from django.test.utils import override_settings
+from django.utils import timezone
 
 if HAS_GEOS:
     from django.contrib.gis.db.models import Collect, Count, Extent, F, Union
     from django.contrib.gis.geometry.backend import Geometry
     from django.contrib.gis.geos import GEOSGeometry, Point, MultiPoint
 
-    from .models import City, Location, DirectoryEntry, Parcel, Book, Author, Article
+    from .models import City, Location, DirectoryEntry, Parcel, Book, Author, Article, Event
 
 
 @skipUnless(HAS_GEOS and HAS_SPATIAL_DB, "Geos and spatial db are required.")
@@ -187 +189 @@
             self.assertEqual(m.point, d['point'])
             self.assertEqual(m.point, t[1])
 
+    @override_settings(USE_TZ=True)
+    def test07b_values(self):
+        "Testing values() and values_list() with aware datetime. See #21565."
+        Event.objects.create(name="foo", when=timezone.now())
+        print Event.objects
+        list(Event.objects.values_list('when'))
+
     def test08_defer_only(self):
         "Testing defer() and only() on Geographic models."
         qs = Location.objects.all()