From 63970f5c610e16478c08459669dfc2e1abf8c0f2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 25 Sep 2012 20:15:51 -0700 Subject: Use constants for hardcoded *DEPEND lists. --- pym/portage/dep/_slot_operator.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'pym/portage/dep') diff --git a/pym/portage/dep/_slot_operator.py b/pym/portage/dep/_slot_operator.py index 9fe19fc59..d7933b592 100644 --- a/pym/portage/dep/_slot_operator.py +++ b/pym/portage/dep/_slot_operator.py @@ -3,13 +3,11 @@ from portage.dep import Atom, paren_enclose, use_reduce from portage.exception import InvalidData - -_dep_keys = ('DEPEND', 'HDEPEND', 'PDEPEND', 'RDEPEND') -_runtime_keys = ('PDEPEND', 'RDEPEND') +from _emerge.Package import Package def find_built_slot_operator_atoms(pkg): atoms = {} - for k in _dep_keys: + for k in Package._dep_keys: atom_list = list(_find_built_slot_operator(use_reduce(pkg.metadata[k], uselist=pkg.use.enabled, eapi=pkg.metadata['EAPI'], token_class=Atom))) @@ -43,11 +41,11 @@ def evaluate_slot_operator_equal_deps(settings, use, trees): target_vardb = trees[trees._target_eroot]["vartree"].dbapi vardbs = [target_vardb] deps = {} - for k in _dep_keys: + for k in Package._dep_keys: deps[k] = use_reduce(metadata[k], uselist=use, eapi=eapi, token_class=Atom) - for k in _runtime_keys: + for k in Package._runtime_keys: _eval_deps(deps[k], vardbs) if running_vardb is not target_vardb: -- cgit v1.2.3-1-g7c22