Permalink
Browse files

[py3] Fixed outdated map() call in GIS sql compiler

  • Loading branch information...
claudep committed Sep 23, 2012
1 parent 98b6ce6 commit 799786a7b64937314250bc638a60b1d4e132bec2
Showing with 6 additions and 1 deletion.
  1. +6 −1 django/contrib/gis/db/models/sql/compiler.py
@@ -1,3 +1,8 @@
+try:
+ from itertools import zip_longest
+except ImportError:
+ from itertools import izip_longest as zip_longest
+
from django.utils.six.moves import zip
from django.db.backends.util import truncate_name, typecast_timestamp
@@ -190,7 +195,7 @@ def resolve_columns(self, row, fields=()):
if self.connection.ops.oracle or getattr(self.query, 'geo_values', False):
# We resolve the rest of the columns if we're on Oracle or if
# the `geo_values` attribute is defined.
- for value, field in map(None, row[index_start:], fields):
+ for value, field in zip_longest(row[index_start:], fields):
values.append(self.query.convert_values(value, field, self.connection))
else:
values.extend(row[index_start:])

0 comments on commit 799786a

Please sign in to comment.