python 2.6 sets depreceated fix
This commit is contained in:
@@ -780,7 +780,6 @@ def build(*args, **kw):
|
|||||||
def clearCache(all=False):
|
def clearCache(all=False):
|
||||||
|
|
||||||
import glob
|
import glob
|
||||||
from sets import Set as set
|
|
||||||
|
|
||||||
def getPackageLists(pkgList):
|
def getPackageLists(pkgList):
|
||||||
latest = {}
|
latest = {}
|
||||||
|
|||||||
@@ -57,7 +57,6 @@ If no packages are given, checks all installed packages.
|
|||||||
component = ctx.get_option('component')
|
component = ctx.get_option('component')
|
||||||
if component:
|
if component:
|
||||||
#FIXME: pisi api is insufficient to do this
|
#FIXME: pisi api is insufficient to do this
|
||||||
from sets import Set as set
|
|
||||||
installed = pisi.api.list_installed()
|
installed = pisi.api.list_installed()
|
||||||
component_pkgs = self.componentdb.get_union_packages(component, walk=True)
|
component_pkgs = self.componentdb.get_union_packages(component, walk=True)
|
||||||
pkgs = list(set(installed) & set(component_pkgs))
|
pkgs = list(set(installed) & set(component_pkgs))
|
||||||
|
|||||||
@@ -62,7 +62,6 @@ Usage: list-installed
|
|||||||
component = ctx.get_option('component')
|
component = ctx.get_option('component')
|
||||||
if component:
|
if component:
|
||||||
#FIXME: pisi api is insufficient to do this
|
#FIXME: pisi api is insufficient to do this
|
||||||
from sets import Set as set
|
|
||||||
component_pkgs = self.componentdb.get_union_packages(component, walk=True)
|
component_pkgs = self.componentdb.get_union_packages(component, walk=True)
|
||||||
installed = list(set(installed) & set(component_pkgs))
|
installed = list(set(installed) & set(component_pkgs))
|
||||||
|
|
||||||
|
|||||||
@@ -59,7 +59,6 @@ Lists the packages that will be upgraded.
|
|||||||
component = ctx.get_option('component')
|
component = ctx.get_option('component')
|
||||||
if component:
|
if component:
|
||||||
#FIXME: PiSi api is insufficient to do this
|
#FIXME: PiSi api is insufficient to do this
|
||||||
from sets import Set as set
|
|
||||||
component_pkgs = self.componentdb.get_union_packages(component, walk=True)
|
component_pkgs = self.componentdb.get_union_packages(component, walk=True)
|
||||||
upgradable_pkgs = list(set(upgradable_pkgs) & set(component_pkgs))
|
upgradable_pkgs = list(set(upgradable_pkgs) & set(component_pkgs))
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
# Please read the COPYING file.
|
# Please read the COPYING file.
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import sets
|
|
||||||
|
|
||||||
import gettext
|
import gettext
|
||||||
__trans = gettext.translation("pisi", fallback=True)
|
__trans = gettext.translation("pisi", fallback=True)
|
||||||
@@ -105,8 +104,8 @@ def find_delta(oldfiles, newfiles):
|
|||||||
for f in newfiles.list:
|
for f in newfiles.list:
|
||||||
hashto_files.setdefault(f.hash, []).append(f)
|
hashto_files.setdefault(f.hash, []).append(f)
|
||||||
|
|
||||||
files_new = sets.Set(map(lambda x:x.hash, newfiles.list))
|
files_new = set(map(lambda x:x.hash, newfiles.list))
|
||||||
files_old = sets.Set(map(lambda x:x.hash, oldfiles.list))
|
files_old = set(map(lambda x:x.hash, oldfiles.list))
|
||||||
files_delta = files_new - files_old
|
files_delta = files_new - files_old
|
||||||
|
|
||||||
deltas = []
|
deltas = []
|
||||||
|
|||||||
Reference in New Issue
Block a user