From 6a8a6dc5553c1638c19270dcda82f4ef92f55e6c Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Wed, 18 Jun 2008 13:13:41 +0100 Subject: [PATCH] Removed use of deprecated "sets" module. Python 2.6 issues a warning. --- zeroinstall/injector/policy.py | 6 +++--- zeroinstall/zerostore/cli.py | 2 +- zeroinstall/zerostore/manifest.py | 1 - zeroinstall/zerostore/unpack.py | 3 +-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/zeroinstall/injector/policy.py b/zeroinstall/injector/policy.py index 33089bb..adf4f17 100644 --- a/zeroinstall/injector/policy.py +++ b/zeroinstall/injector/policy.py @@ -8,7 +8,7 @@ settings. # See the README file for details, or visit http://0install.net. import time -import sys, os, sets +import sys, os from logging import info, debug, warn import arch @@ -72,7 +72,7 @@ class Policy(object): self.watchers = [] self.freshness = 60 * 60 * 24 * 30 self.src = src # Root impl must be a "src" machine type - self.stale_feeds = sets.Set() + self.stale_feeds = set() from zeroinstall.injector.solver import DefaultSolver self.solver = DefaultSolver(network_full, iface_cache, iface_cache.stores) @@ -132,7 +132,7 @@ class Policy(object): def recalculate(self, fetch_stale_interfaces = True): """@deprecated: see L{solve_with_downloads} """ - self.stale_feeds = sets.Set() + self.stale_feeds = set() host_arch = arch.get_host_architecture() if self.src: diff --git a/zeroinstall/zerostore/cli.py b/zeroinstall/zerostore/cli.py index d46524b..38de729 100644 --- a/zeroinstall/zerostore/cli.py +++ b/zeroinstall/zerostore/cli.py @@ -4,7 +4,7 @@ # See the README file for details, or visit http://0install.net. import sys, os -from zeroinstall.zerostore.manifest import generate_manifest, verify, get_algorithm, copy_tree_with_verify +from zeroinstall.zerostore.manifest import verify, get_algorithm, copy_tree_with_verify from zeroinstall import zerostore, SafeException, support stores = None diff --git a/zeroinstall/zerostore/manifest.py b/zeroinstall/zerostore/manifest.py index d176c42..7302706 100644 --- a/zeroinstall/zerostore/manifest.py +++ b/zeroinstall/zerostore/manifest.py @@ -25,7 +25,6 @@ A top-level ".manifest" file is ignored. from __future__ import generators import os, stat -from sets import Set import sha from zeroinstall import SafeException from zeroinstall.zerostore import BadDigest diff --git a/zeroinstall/zerostore/unpack.py b/zeroinstall/zerostore/unpack.py index 57567a8..bb3e37a 100644 --- a/zeroinstall/zerostore/unpack.py +++ b/zeroinstall/zerostore/unpack.py @@ -7,9 +7,8 @@ import os import shutil import traceback from tempfile import mkdtemp, mkstemp -import sha import re -from logging import debug, info, warn +from logging import debug, warn from zeroinstall import SafeException from zeroinstall.support import find_in_path, ro_rmtree -- 2.11.4.GIT