From 727abd89a87db835906fb53e0455feb75ae323d8 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 25 Feb 2010 20:42:04 +0000
Subject: Move dep_expand and cpv_expand into portage.dbapi submodules.

svn path=/main/trunk/; revision=15460
---
 pym/_emerge/actions.py  | 3 ++-
 pym/_emerge/depgraph.py | 3 ++-
 pym/_emerge/main.py     | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'pym/_emerge')

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 702ccff98..b45c95c15 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -27,6 +27,7 @@ from portage import digraph
 from portage import _unicode_decode
 from portage.cache.cache_errors import CacheError
 from portage.const import NEWS_LIB_PATH
+from portage.dbapi.dep_expand import dep_expand
 from portage.output import blue, bold, colorize, create_color_func, darkgreen, \
 	red, yellow
 good = create_color_func("GOOD")
@@ -2212,7 +2213,7 @@ def action_uninstall(settings, trees, ldpath_mtimes,
 
 			try:
 				valid_atoms.append(
-					portage.dep_expand(x, mydb=vardb, settings=settings))
+					dep_expand(x, mydb=vardb, settings=settings))
 			except portage.exception.AmbiguousPackageName as e:
 				msg = "The short ebuild name \"" + x + \
 					"\" is ambiguous.  Please specify " + \
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 86b4cfccf..2ad67713b 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -15,6 +15,7 @@ import portage
 from portage import os
 from portage import digraph
 from portage.dbapi import dbapi
+from portage.dbapi.dep_expand import dep_expand
 from portage.dep import Atom
 from portage.output import bold, blue, colorize, create_color_func, darkblue, \
 	darkgreen, green, nc_len, red, teal, turquoise, yellow
@@ -4160,7 +4161,7 @@ class depgraph(object):
 				else:
 					blocker_style = "PKG_BLOCKER"
 					addl = "%s  %s  " % (colorize(blocker_style, "B"), fetch)
-				resolved = portage.dep_expand(
+				resolved = dep_expand(
 					str(x.atom).lstrip("!"), mydb=vardb, settings=pkgsettings)
 				if "--columns" in self._frozen_config.myopts and "--quiet" in self._frozen_config.myopts:
 					addl += " " + colorize(blocker_style, str(resolved))
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 3a9990188..43655c5b3 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -32,6 +32,7 @@ import portage.util
 import portage.locks
 import portage.exception
 from portage.data import secpass
+from portage.dbapi.dep_expand import dep_expand
 from portage.util import normalize_path as normpath
 from portage.util import writemsg, writemsg_level, writemsg_stdout
 from portage.sets import SETPREFIX
@@ -1500,7 +1501,7 @@ def emerge_main():
 			if is_valid_package_atom(x):
 				try:
 					valid_atoms.append(
-						portage.dep_expand(x, mydb=vardb, settings=settings))
+						dep_expand(x, mydb=vardb, settings=settings))
 				except portage.exception.AmbiguousPackageName as e:
 					msg = "The short ebuild name \"" + x + \
 						"\" is ambiguous.  Please specify " + \
-- 
cgit v1.2.3-1-g7c22