Use six.moves for itertools, urllib and intern

They're renamed in python3.

Signed-off-by: Julien Cristau <jcristau@debian.org>
master
Julien Cristau 9 years ago committed by Niels Thykier
parent f83029c55e
commit 18f7101847

@ -185,15 +185,15 @@ import os
import sys import sys
import time import time
import optparse import optparse
import urllib
import apt_pkg import apt_pkg
from collections import defaultdict from collections import defaultdict
from functools import reduce, partial from functools import reduce, partial
from itertools import chain, ifilter, product from itertools import chain, product
from operator import attrgetter from operator import attrgetter
from six.moves import filter as ifilter, intern, urllib_parse as urllib
from installability.builder import InstallabilityTesterBuilder from installability.builder import InstallabilityTesterBuilder
from excuse import Excuse from excuse import Excuse

@ -24,12 +24,16 @@
import apt_pkg import apt_pkg
from functools import partial from functools import partial
from datetime import datetime from datetime import datetime
from itertools import chain, ifilter, ifilterfalse, izip, repeat from itertools import chain, repeat
import os import os
import re import re
import time import time
import yaml import yaml
from six.moves import (filter as ifilter,
filterfalse as ifilterfalse,
zip as izip)
from migrationitem import MigrationItem, UnversionnedMigrationItem from migrationitem import MigrationItem, UnversionnedMigrationItem
from consts import (VERSION, BINARIES, PROVIDES, DEPENDS, CONFLICTS, from consts import (VERSION, BINARIES, PROVIDES, DEPENDS, CONFLICTS,

@ -13,7 +13,8 @@
# GNU General Public License for more details. # GNU General Public License for more details.
from functools import partial from functools import partial
from itertools import ifilter, ifilterfalse
from six.moves import filter as ifilter, filterfalse as ifilterfalse
from britney_util import iter_except from britney_util import iter_except

Loading…
Cancel
Save