diff options
author | 2016-03-05 20:30:37 -0500 | |
---|---|---|
committer | 2016-03-05 20:50:07 -0500 | |
commit | 18dc4a68e9d52dc8422d554bcb8b58f03f0c49ae (patch) | |
tree | 9db2a1d28e0ddbbdecc4c5fcf26579ed0e705dcc | |
parent | split_negations() was moved to snakeoil.sequences (diff) | |
download | pkgcore-18dc4a68e9d52dc8422d554bcb8b58f03f0c49ae.tar.gz pkgcore-18dc4a68e9d52dc8422d554bcb8b58f03f0c49ae.tar.bz2 pkgcore-18dc4a68e9d52dc8422d554bcb8b58f03f0c49ae.zip |
move snakeoil.lists to snakeoil.sequences
-rw-r--r-- | pkgcore/ebuild/conditionals.py | 2 | ||||
-rw-r--r-- | pkgcore/ebuild/digest.py | 2 | ||||
-rw-r--r-- | pkgcore/ebuild/domain.py | 3 | ||||
-rw-r--r-- | pkgcore/ebuild/ebd.py | 2 | ||||
-rw-r--r-- | pkgcore/ebuild/formatter.py | 2 | ||||
-rw-r--r-- | pkgcore/ebuild/misc.py | 3 | ||||
-rw-r--r-- | pkgcore/ebuild/pkg_updates.py | 2 | ||||
-rw-r--r-- | pkgcore/ebuild/repo_objs.py | 2 | ||||
-rw-r--r-- | pkgcore/ebuild/triggers.py | 2 | ||||
-rw-r--r-- | pkgcore/operations/format.py | 2 | ||||
-rw-r--r-- | pkgcore/repository/prototype.py | 2 | ||||
-rw-r--r-- | pkgcore/resolver/choice_point.py | 2 | ||||
-rw-r--r-- | pkgcore/restrictions/util.py | 2 | ||||
-rw-r--r-- | pkgcore/restrictions/values.py | 6 | ||||
-rw-r--r-- | pkgcore/scripts/pclean.py | 2 | ||||
-rw-r--r-- | pkgcore/scripts/pinspect.py | 2 | ||||
-rw-r--r-- | pkgcore/scripts/pmaint.py | 2 | ||||
-rw-r--r-- | pkgcore/scripts/pmerge.py | 2 | ||||
-rw-r--r-- | pkgcore/scripts/pplugincache.py | 4 | ||||
-rw-r--r-- | pkgcore/scripts/pquery.py | 2 | ||||
-rw-r--r-- | pkgcore/system/libtool.py | 2 | ||||
-rw-r--r-- | pkgcore/test/ebuild/test_conditionals.py | 2 | ||||
-rw-r--r-- | pkgcore/test/fetch/test_init.py | 2 | ||||
-rw-r--r-- | pkgcore/test/test_plugin.py | 4 | ||||
-rw-r--r-- | pkgcore/util/commandline.py | 2 |
25 files changed, 29 insertions, 31 deletions
diff --git a/pkgcore/ebuild/conditionals.py b/pkgcore/ebuild/conditionals.py index d4352911f..a3bd6ee2a 100644 --- a/pkgcore/ebuild/conditionals.py +++ b/pkgcore/ebuild/conditionals.py @@ -11,7 +11,7 @@ __all__ = ("DepSet", "stringify_boolean") from snakeoil.compatibility import raise_from, IGNORED_EXCEPTIONS from snakeoil.iterables import expandable_chain -from snakeoil.lists import iflatten_instance +from snakeoil.sequences import iflatten_instance from pkgcore.ebuild.atom import atom, transitive_use_atom from pkgcore.ebuild.errors import ParseError diff --git a/pkgcore/ebuild/digest.py b/pkgcore/ebuild/digest.py index 348578cba..f83121c08 100644 --- a/pkgcore/ebuild/digest.py +++ b/pkgcore/ebuild/digest.py @@ -23,7 +23,7 @@ from pkgcore.fs.livefs import iter_scan demandload( "errno", 'snakeoil:mappings', - "snakeoil.lists:iflatten_instance", + "snakeoil.sequences:iflatten_instance", ) diff --git a/pkgcore/ebuild/domain.py b/pkgcore/ebuild/domain.py index 5c3db9c49..3467c8274 100644 --- a/pkgcore/ebuild/domain.py +++ b/pkgcore/ebuild/domain.py @@ -18,10 +18,9 @@ from snakeoil.bash import iter_read_bash from snakeoil.compatibility import raise_from from snakeoil.data_source import local_source from snakeoil.demandload import demandload -from snakeoil.lists import unstable_unique, predicate_split from snakeoil.mappings import ProtectedDict from snakeoil.osutils import pjoin -from snakeoil.sequences import split_negations +from snakeoil.sequences import split_negations, unstable_unique, predicate_split from pkgcore.config import ConfigHint from pkgcore.config.domain import domain as config_domain diff --git a/pkgcore/ebuild/ebd.py b/pkgcore/ebuild/ebd.py index 8b1fdf777..11addcd75 100644 --- a/pkgcore/ebuild/ebd.py +++ b/pkgcore/ebuild/ebd.py @@ -37,7 +37,7 @@ from pkgcore.spawn import ( demandload( 'textwrap', "time", - 'snakeoil.lists:iflatten_instance', + 'snakeoil.sequences:iflatten_instance', 'pkgcore:fetch', "pkgcore.log:logger", "pkgcore.package.mutated:MutatedPkg", diff --git a/pkgcore/ebuild/formatter.py b/pkgcore/ebuild/formatter.py index 3d7fdd805..7fd919b9d 100644 --- a/pkgcore/ebuild/formatter.py +++ b/pkgcore/ebuild/formatter.py @@ -15,7 +15,7 @@ import operator from snakeoil.cli.input import userquery from snakeoil.demandload import demandload -from snakeoil.lists import iflatten_instance +from snakeoil.sequences import iflatten_instance from pkgcore.config import configurable diff --git a/pkgcore/ebuild/misc.py b/pkgcore/ebuild/misc.py index 2cbeef2f9..87b8993b3 100644 --- a/pkgcore/ebuild/misc.py +++ b/pkgcore/ebuild/misc.py @@ -19,8 +19,7 @@ from itertools import chain from snakeoil import compatibility, mappings from snakeoil.klass import generic_equality, alias_method -from snakeoil.lists import iflatten_instance, stable_unique -from snakeoil.sequences import namedtuple +from snakeoil.sequences import namedtuple, iflatten_instance, stable_unique from pkgcore.ebuild import atom from pkgcore.restrictions import packages, restriction, boolean diff --git a/pkgcore/ebuild/pkg_updates.py b/pkgcore/ebuild/pkg_updates.py index 91a9453a2..0902d3b85 100644 --- a/pkgcore/ebuild/pkg_updates.py +++ b/pkgcore/ebuild/pkg_updates.py @@ -6,8 +6,8 @@ from operator import itemgetter from snakeoil.demandload import demandload, demand_compile_regexp from snakeoil.fileutils import readlines -from snakeoil.lists import iflatten_instance from snakeoil.osutils import listdir_files, pjoin +from snakeoil.sequences import iflatten_instance from pkgcore.ebuild.atom import atom diff --git a/pkgcore/ebuild/repo_objs.py b/pkgcore/ebuild/repo_objs.py index 1903b7f60..6059d7235 100644 --- a/pkgcore/ebuild/repo_objs.py +++ b/pkgcore/ebuild/repo_objs.py @@ -26,7 +26,7 @@ demandload( 'errno', 'snakeoil.bash:BashParseError,iter_read_bash,read_dict', 'snakeoil.fileutils:readfile,readlines_ascii', - 'snakeoil.lists:iter_stable_unique', + 'snakeoil.sequences:iter_stable_unique', 'snakeoil.xml:etree', 'pkgcore.ebuild:atom,profiles', 'pkgcore.log:logger', diff --git a/pkgcore/ebuild/triggers.py b/pkgcore/ebuild/triggers.py index 6110b28cb..0112f478e 100644 --- a/pkgcore/ebuild/triggers.py +++ b/pkgcore/ebuild/triggers.py @@ -18,8 +18,8 @@ import os from snakeoil.bash import read_bash_dict from snakeoil.demandload import demandload from snakeoil.fileutils import AtomicWriteFile -from snakeoil.lists import stable_unique, iflatten_instance from snakeoil.osutils import listdir_files, normpath, pjoin +from snakeoil.sequences import stable_unique, iflatten_instance from pkgcore.merge import triggers, const, errors from pkgcore.fs import livefs diff --git a/pkgcore/operations/format.py b/pkgcore/operations/format.py index aaab63941..025a5f231 100644 --- a/pkgcore/operations/format.py +++ b/pkgcore/operations/format.py @@ -17,7 +17,7 @@ from snakeoil.dependant_methods import ForcedDepends from pkgcore import operations as _operations_mod demandload( - 'snakeoil.lists:iflatten_instance', + 'snakeoil.sequences:iflatten_instance', 'pkgcore:fetch@_fetch_module', ) diff --git a/pkgcore/repository/prototype.py b/pkgcore/repository/prototype.py index b75f4f324..f7617a3b2 100644 --- a/pkgcore/repository/prototype.py +++ b/pkgcore/repository/prototype.py @@ -12,8 +12,8 @@ __all__ = ( import os from snakeoil.compatibility import is_py3k -from snakeoil.lists import iflatten_instance from snakeoil.mappings import LazyValDict, DictMixin +from snakeoil.sequences import iflatten_instance from pkgcore.ebuild.atom import atom from pkgcore.operations import repo diff --git a/pkgcore/resolver/choice_point.py b/pkgcore/resolver/choice_point.py index c8e613880..edae9a86b 100644 --- a/pkgcore/resolver/choice_point.py +++ b/pkgcore/resolver/choice_point.py @@ -4,7 +4,7 @@ __all__ = ("choice_point",) from snakeoil import klass -from snakeoil.lists import iter_stable_unique +from snakeoil.sequences import iter_stable_unique class choice_point(object): diff --git a/pkgcore/restrictions/util.py b/pkgcore/restrictions/util.py index 2239590fd..a3e5744ba 100644 --- a/pkgcore/restrictions/util.py +++ b/pkgcore/restrictions/util.py @@ -5,7 +5,7 @@ restriction related utilities """ -from snakeoil.lists import iflatten_func +from snakeoil.sequences import iflatten_func from pkgcore.restrictions import packages, boolean, restriction diff --git a/pkgcore/restrictions/values.py b/pkgcore/restrictions/values.py index 5d52ecb0c..b08b56820 100644 --- a/pkgcore/restrictions/values.py +++ b/pkgcore/restrictions/values.py @@ -18,7 +18,7 @@ from pkgcore.restrictions import restriction, boolean, packages demandload( 're', - 'snakeoil:lists', + 'snakeoil.sequences:iflatten_instance', ) # Backwards compatibility. @@ -536,7 +536,7 @@ class FlatteningRestriction(base): :type dont_iter: type or tuple of types :param dont_iter: type(s) not to flatten. - Passed to :obj:`snakeoil.lists.iflatten_instance`. + Passed to :obj:`snakeoil.sequences.iflatten_instance`. :type childrestriction: restriction :param childrestriction: restriction applied to the flattened list. """ @@ -546,7 +546,7 @@ class FlatteningRestriction(base): def match(self, val): return self.restriction.match( - lists.iflatten_instance(val, self.dont_iter)) != self.negate + iflatten_instance(val, self.dont_iter)) != self.negate def __str__(self): return 'flattening_restriction: dont_iter = %s, restriction = %s' % ( diff --git a/pkgcore/scripts/pclean.py b/pkgcore/scripts/pclean.py index 628533370..84a7b3c99 100644 --- a/pkgcore/scripts/pclean.py +++ b/pkgcore/scripts/pclean.py @@ -20,8 +20,8 @@ demandload( 're', 'time', 'shutil', - 'snakeoil.lists:iflatten_instance', 'snakeoil.osutils:listdir_dirs,listdir_files,pjoin', + 'snakeoil.sequences:iflatten_instance', 'pkgcore:fetch', 'pkgcore.ebuild:atom', 'pkgcore.package:errors', diff --git a/pkgcore/scripts/pinspect.py b/pkgcore/scripts/pinspect.py index 21fc1d783..26a0012c5 100644 --- a/pkgcore/scripts/pinspect.py +++ b/pkgcore/scripts/pinspect.py @@ -34,7 +34,7 @@ demandload( 'collections:defaultdict', 'itertools:groupby,islice', 'operator:attrgetter,itemgetter', - 'snakeoil.lists:iflatten_instance,unstable_unique', + 'snakeoil.sequences:iflatten_instance,unstable_unique', 'pkgcore:fetch', 'pkgcore.package:errors', 'pkgcore.restrictions:packages', diff --git a/pkgcore/scripts/pmaint.py b/pkgcore/scripts/pmaint.py index 97a5d8dd9..793a0f190 100644 --- a/pkgcore/scripts/pmaint.py +++ b/pkgcore/scripts/pmaint.py @@ -26,7 +26,7 @@ demandload( 'snakeoil:compatibility', 'snakeoil.fileutils:AtomicWriteFile', 'snakeoil.osutils:pjoin,listdir_dirs', - 'snakeoil.lists:iter_stable_unique', + 'snakeoil.sequences:iter_stable_unique', 'pkgcore.ebuild:processor,triggers', 'pkgcore.fs:contents,livefs', 'pkgcore.merge:triggers@merge_triggers', diff --git a/pkgcore/scripts/pmerge.py b/pkgcore/scripts/pmerge.py index a562c2b2c..baf70cc4f 100644 --- a/pkgcore/scripts/pmerge.py +++ b/pkgcore/scripts/pmerge.py @@ -16,7 +16,7 @@ from functools import partial import sys from time import time -from snakeoil.lists import iflatten_instance, stable_unique +from snakeoil.sequences import iflatten_instance, stable_unique from pkgcore.ebuild import resolver, restricts from pkgcore.ebuild.atom import atom diff --git a/pkgcore/scripts/pplugincache.py b/pkgcore/scripts/pplugincache.py index deea86020..a00bf593f 100644 --- a/pkgcore/scripts/pplugincache.py +++ b/pkgcore/scripts/pplugincache.py @@ -6,7 +6,7 @@ from functools import partial -from snakeoil import lists +from snakeoil.sequences import stable_unique from pkgcore import plugin, plugins from pkgcore.util import commandline @@ -23,6 +23,6 @@ argparser.add_argument( @argparser.bind_main_func def main(options, out, err): """Update caches.""" - for package in lists.stable_unique(options.packages): + for package in stable_unique(options.packages): out.write('Updating cache for %s...' % (package.__name__,)) plugin.initialize_cache(package, force=True) diff --git a/pkgcore/scripts/pquery.py b/pkgcore/scripts/pquery.py index 2eeee87c5..783976074 100644 --- a/pkgcore/scripts/pquery.py +++ b/pkgcore/scripts/pquery.py @@ -32,8 +32,8 @@ demandload( 'errno', 'os', 're', - 'snakeoil.lists:iter_stable_unique', 'snakeoil.osutils:sizeof_fmt', + 'snakeoil.sequences:iter_stable_unique', 'pkgcore.fs:fs@fs_module,contents@contents_module', 'pkgcore.repository:multiplex', ) diff --git a/pkgcore/system/libtool.py b/pkgcore/system/libtool.py index 53612c1cb..beea2008c 100644 --- a/pkgcore/system/libtool.py +++ b/pkgcore/system/libtool.py @@ -7,8 +7,8 @@ from functools import partial from os.path import basename, dirname import re -from snakeoil.lists import stable_unique from snakeoil.currying import post_curry +from snakeoil.sequences import stable_unique from pkgcore.merge import triggers diff --git a/pkgcore/test/ebuild/test_conditionals.py b/pkgcore/test/ebuild/test_conditionals.py index 15de963e3..549982001 100644 --- a/pkgcore/test/ebuild/test_conditionals.py +++ b/pkgcore/test/ebuild/test_conditionals.py @@ -3,7 +3,7 @@ from snakeoil.currying import post_curry from snakeoil.iterables import expandable_chain -from snakeoil.lists import iflatten_instance +from snakeoil.sequences import iflatten_instance from snakeoil.test import mk_cpy_loadable_testcase from pkgcore.ebuild import conditionals diff --git a/pkgcore/test/fetch/test_init.py b/pkgcore/test/fetch/test_init.py index 169f5335a..0d47e165c 100644 --- a/pkgcore/test/fetch/test_init.py +++ b/pkgcore/test/fetch/test_init.py @@ -1,7 +1,7 @@ # Copyright: 2006 Brian Harring <ferringb@gmail.com> # License: GPL2/BSD -from snakeoil.lists import iflatten_instance +from snakeoil.sequences import iflatten_instance from pkgcore import fetch from pkgcore.test import TestCase diff --git a/pkgcore/test/test_plugin.py b/pkgcore/test/test_plugin.py index 1c3bbb7ca..a8bd3a613 100644 --- a/pkgcore/test/test_plugin.py +++ b/pkgcore/test/test_plugin.py @@ -8,8 +8,8 @@ import shutil import sys import tempfile -from snakeoil import lists from snakeoil.osutils import pjoin +from snakeoil.sequences import stable_unique from pkgcore import plugin from pkgcore.test import silence_logging, TestCase @@ -92,7 +92,7 @@ pkgcore_plugins = {'plugtest': [HiddenPlug]} def test_extend_path(self): import mod_testplug - expected = lists.stable_unique( + expected = stable_unique( pjoin(p, 'mod_testplug') for p in sys.path if os.path.isdir(p)) self.assertEqual( diff --git a/pkgcore/util/commandline.py b/pkgcore/util/commandline.py index 5e60bcac1..86ff5ceb5 100644 --- a/pkgcore/util/commandline.py +++ b/pkgcore/util/commandline.py @@ -36,7 +36,7 @@ demandload( 'traceback', 'snakeoil:osutils', 'snakeoil.errors:walk_exception_chain', - 'snakeoil.lists:iflatten_instance,unstable_unique', + 'snakeoil.sequences:iflatten_instance,unstable_unique', 'pkgcore:operations', 'pkgcore.config:basics', 'pkgcore.restrictions:packages,restriction', |