Skip to content

Commit

Permalink
Used six.moves.zip_longest, new in six 1.4.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
aaugustin committed Sep 2, 2013
1 parent 365c3e8 commit 868b4c9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 deletions.
6 changes: 1 addition & 5 deletions 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
Expand Down
6 changes: 1 addition & 5 deletions 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):
Expand Down
6 changes: 1 addition & 5 deletions 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):
Expand Down

0 comments on commit 868b4c9

Please sign in to comment.