Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Used six.moves.zip_longest, new in six 1.4.0.

  • Loading branch information...
commit 2a14c08e71330827f44acc53708194bf6aadee47 1 parent 1153180
@aaugustin aaugustin authored
View
6 django/contrib/gis/db/models/sql/compiler.py
@@ -1,15 +1,11 @@
import datetime
-try:
- from itertools import zip_longest
-except ImportError:
- from itertools import izip_longest as zip_longest
from django.conf import settings
from django.db.backends.util import truncate_name, typecast_date, typecast_timestamp
from django.db.models.sql import compiler
from django.db.models.sql.constants import MULTI
from django.utils import six
-from django.utils.six.moves import zip
+from django.utils.six.moves import zip, zip_longest
from django.utils import timezone
SQLCompiler = compiler.SQLCompiler
View
6 django/db/backends/mysql/compiler.py
@@ -1,9 +1,5 @@
-try:
- from itertools import zip_longest
-except ImportError:
- from itertools import izip_longest as zip_longest
-
from django.db.models.sql import compiler
+from django.utils.six.moves import zip_longest
class SQLCompiler(compiler.SQLCompiler):
View
6 django/db/backends/oracle/compiler.py
@@ -1,9 +1,5 @@
from django.db.models.sql import compiler
-# The izip_longest was renamed to zip_longest in py3
-try:
- from itertools import zip_longest
-except ImportError:
- from itertools import izip_longest as zip_longest
+from django.utils.six.moves import zip_longest
class SQLCompiler(compiler.SQLCompiler):
Please sign in to comment.
Something went wrong with that request. Please try again.