Fixed #28495 -- Converted GDAL Feature.fields to strings

claudep · claudep · commit 546412e6731e · 2017-08-15T19:31:22.000+02:00
diff --git a/django/contrib/gis/gdal/feature.py b/django/contrib/gis/gdal/feature.py
@@ -82,8 +82,13 @@ def num_fields(self):
     @property
     def fields(self):
         "Return a list of fields in the Feature."
-        return [capi.get_field_name(capi.get_field_defn(self._layer._ldefn, i))
-                for i in range(self.num_fields)]
+        return [
+            force_text(
+                capi.get_field_name(capi.get_field_defn(self._layer._ldefn, i)),
+                self.encoding,
+                strings_only=True
+            ) for i in range(self.num_fields)
+        ]
 
     @property
     def geom(self):
diff --git a/tests/gis_tests/gdal_tests/test_ds.py b/tests/gis_tests/gdal_tests/test_ds.py
@@ -195,6 +195,7 @@ def test04_features(self):
                         # Making sure we get the proper OGR Field instance, using
                         # a string value index for the feature.
                         self.assertIsInstance(feat[k], v)
+                    self.assertIsInstance(feat.fields[0], str)
 
                     # Testing Feature.__iter__
                     for fld in feat:
