diff options
| author |   Tim Harder <radhermit@gmail.com> | 2015-02-15 18:07:59 -0800 |
|---|---|---|
| committer | Tim Harder <radhermit@gmail.com> | 2015-02-15 22:10:11 -0800 |
| commit | 302edcf9781a053be28680b6ffd41803f5a924b4 (patch) | |
| tree | bc7700501d8e37647dda000b406a08b02e233160 | |
| parent | profiles: don't cache rarely used values retrieved directly from make.defaults (diff) | |
| download | pkgcore-302edcf9781a053be28680b6ffd41803f5a924b4.tar.gz pkgcore-302edcf9781a053be28680b6ffd41803f5a924b4.tar.bz2 pkgcore-302edcf9781a053be28680b6ffd41803f5a924b4.zip | |
profiles: simplify ebuild atom import namespace
| -rw-r--r-- | pkgcore/ebuild/profiles.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgcore/ebuild/profiles.py b/pkgcore/ebuild/profiles.py index 5ab611d35..dafdc91e1 100644 --- a/pkgcore/ebuild/profiles.py +++ b/pkgcore/ebuild/profiles.py @@ -30,7 +30,8 @@ demandload( 'collections:defaultdict', 'snakeoil.data_source:local_source', 'snakeoil.mappings:ImmutableDict', - 'pkgcore.ebuild:cpv,atom,repo_objs', + 'pkgcore.ebuild:cpv,repo_objs', + 'pkgcore.ebuild.atom:atom', 'pkgcore.ebuild.eapi:get_eapi', 'pkgcore.fs.livefs:iter_scan', 'pkgcore.repository.util:SimpleTree', @@ -263,7 +264,7 @@ class ProfileNode(object): raise Exception("malformed line- %r" % (line,)) d[a.key].append(chunked_data(a, *split_negations(l[1:]))) - return ImmutableDict((k, _build_cp_atom_payload(v, atom.atom(k))) + return ImmutableDict((k, _build_cp_atom_payload(v, atom(k))) for k, v in d.iteritems()) def _parse_use(self, data): @@ -821,9 +822,9 @@ class AliasedVirtuals(virtual.tree): def _fetch_metadata(self, pkg): data = self._virtuals[pkg.package] - if isinstance(data, atom.atom): + if isinstance(data, atom): data = [data] - data = [atom.atom("=%s-%s" % (x.key, pkg.fullver)) for x in data] + data = [atom("=%s-%s" % (x.key, pkg.fullver)) for x in data] if len(data) == 1: return data[0] return packages.OrRestriction(*data) |