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

This commit is contained in:
Aymeric Augustin 2013-09-02 12:10:03 +02:00
parent 365c3e8b73
commit 868b4c921c
3 changed files with 3 additions and 15 deletions

View File

@ -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 File

@ -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 File

@ -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):