From 18f71018476287abd0247cfdc641c106e599659c Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sat, 25 Apr 2015 16:49:16 +0200 Subject: [PATCH] Use six.moves for itertools, urllib and intern They're renamed in python3. Signed-off-by: Julien Cristau --- britney.py | 4 ++-- britney_util.py | 6 +++++- installability/tester.py | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/britney.py b/britney.py index f29a103..1dbfdc4 100755 --- a/britney.py +++ b/britney.py @@ -185,15 +185,15 @@ import os import sys import time import optparse -import urllib import apt_pkg from collections import defaultdict from functools import reduce, partial -from itertools import chain, ifilter, product +from itertools import chain, product from operator import attrgetter +from six.moves import filter as ifilter, intern, urllib_parse as urllib from installability.builder import InstallabilityTesterBuilder from excuse import Excuse diff --git a/britney_util.py b/britney_util.py index 3612a36..e32bb32 100644 --- a/britney_util.py +++ b/britney_util.py @@ -24,12 +24,16 @@ import apt_pkg from functools import partial from datetime import datetime -from itertools import chain, ifilter, ifilterfalse, izip, repeat +from itertools import chain, repeat import os import re import time import yaml +from six.moves import (filter as ifilter, + filterfalse as ifilterfalse, + zip as izip) + from migrationitem import MigrationItem, UnversionnedMigrationItem from consts import (VERSION, BINARIES, PROVIDES, DEPENDS, CONFLICTS, diff --git a/installability/tester.py b/installability/tester.py index 4be7dba..ca0372e 100644 --- a/installability/tester.py +++ b/installability/tester.py @@ -13,7 +13,8 @@ # GNU General Public License for more details. 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