diff options
| author |   Tim Harder <radhermit@gmail.com> | 2015-06-27 15:26:48 -0400 |
|---|---|---|
| committer | Tim Harder <radhermit@gmail.com> | 2015-06-27 15:26:48 -0400 |
| commit | 68b7e620ecc4767759a1a4c2f28205f100013b9f (patch) | |
| tree | a16fa570ab1f08fb50cce43b743ae1390f8f8629 | |
| parent | portage_conf: re-add config object simplification for the base case (diff) | |
| download | pkgcore-68b7e620ecc4767759a1a4c2f28205f100013b9f.tar.gz pkgcore-68b7e620ecc4767759a1a4c2f28205f100013b9f.tar.bz2 pkgcore-68b7e620ecc4767759a1a4c2f28205f100013b9f.zip | |
use OrderedDict from collections instead of snakeoil.mappings
| -rw-r--r-- | pkgcore/binpkg/xpak.py | 4 | ||||
| -rw-r--r-- | pkgcore/fs/contents.py | 3 | ||||
| -rw-r--r-- | pkgcore/test/repository/test_multiplex.py | 3 | ||||
| -rw-r--r-- | pkgcore/test/repository/test_prototype.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/pkgcore/binpkg/xpak.py b/pkgcore/binpkg/xpak.py index b671c098c..67c28733c 100644 --- a/pkgcore/binpkg/xpak.py +++ b/pkgcore/binpkg/xpak.py @@ -7,11 +7,13 @@ XPAK container support __all__ = ("MalformedXpak", "Xpak") +from collections import OrderedDict + from snakeoil import compatibility, klass from snakeoil import struct_compat as struct from snakeoil.compatibility import raise_from from snakeoil.demandload import demandload -from snakeoil.mappings import OrderedDict, autoconvert_py3k_methods_metaclass +from snakeoil.mappings import autoconvert_py3k_methods_metaclass demandload( "errno", diff --git a/pkgcore/fs/contents.py b/pkgcore/fs/contents.py index 033dfe13c..b70db07d5 100644 --- a/pkgcore/fs/contents.py +++ b/pkgcore/fs/contents.py @@ -16,10 +16,9 @@ from snakeoil.osutils import normpath, pjoin from pkgcore.fs import fs demandload( - 'collections:defaultdict', + 'collections:defaultdict,OrderedDict', 'os:path', 'time', - 'snakeoil.mappings:OrderedDict', ) diff --git a/pkgcore/test/repository/test_multiplex.py b/pkgcore/test/repository/test_multiplex.py index b61411522..ff6c3bf41 100644 --- a/pkgcore/test/repository/test_multiplex.py +++ b/pkgcore/test/repository/test_multiplex.py @@ -1,10 +1,9 @@ # Copyright: 2006 Brian Harring <ferringb@gmail.com> # License: GPL2/BSD +from collections import OrderedDict from functools import partial -from snakeoil.mappings import OrderedDict - from pkgcore.repository.multiplex import tree from pkgcore.repository.util import SimpleTree from pkgcore.restrictions import packages, values diff --git a/pkgcore/test/repository/test_prototype.py b/pkgcore/test/repository/test_prototype.py index 01ea72a37..685bac3fb 100644 --- a/pkgcore/test/repository/test_prototype.py +++ b/pkgcore/test/repository/test_prototype.py @@ -1,10 +1,10 @@ # Copyright: 2006-2009 Brian Harring <ferringb@gmail.com> # License: GPL2/BSD +from collections import OrderedDict from functools import partial from snakeoil.currying import post_curry -from snakeoil.mappings import OrderedDict from pkgcore.ebuild.atom import atom from pkgcore.ebuild.cpv import versioned_CPV |