[gentoo-commits] proj/gentoopm:master commit in: gentoopm/portagepm/

["Michał Górny" <mgorny@gentoo.org>]

commit:     3e8b0067791e55c4a28c6a0a275e55f0eb7d21a9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 21:53:44 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 22:16:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=3e8b0067

Portage: Pass FakeSettings to instantiate atoms without dbapi.

---
 gentoopm/portagepm/__init__.py |    2 +-
 gentoopm/portagepm/atom.py     |   14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/gentoopm/portagepm/__init__.py b/gentoopm/portagepm/__init__.py
index 4b1887a..6bade14 100644
--- a/gentoopm/portagepm/__init__.py
+++ b/gentoopm/portagepm/__init__.py
@@ -32,4 +32,4 @@ class PortagePM(PackageManager):
 
 	@property
 	def Atom(self):
-		return functools.partial(PortageAtom, pm = self)
+		return PortageAtom

diff --git a/gentoopm/portagepm/atom.py b/gentoopm/portagepm/atom.py
index 121e3b1..7614298 100644
--- a/gentoopm/portagepm/atom.py
+++ b/gentoopm/portagepm/atom.py
@@ -3,6 +3,8 @@
 # (c) 2011 Michał Górny <mgorny@gentoo.org>
 # Released under the terms of the 2-clause BSD license.
 
+import collections
+
 import portage.exception as pe
 from portage.dbapi.dep_expand import dep_expand
 from portage.dep import match_from_list
@@ -11,10 +13,18 @@ from portage.versions import catsplit
 from gentoopm.basepm.atom import PMAtom
 from gentoopm.exceptions import InvalidAtomStringError
 
+class FakeSettings(object):
+	"""
+	Fake settings object, to satisfy cpv_expand().
+	"""
+
+	def __getattr__(self, key):
+		return lambda: collections.defaultdict(lambda: '')
+
 class PortageAtom(object):
-	def __new__(self, s, pm):
+	def __new__(self, s):
 		try:
-			a = dep_expand(s, settings = pm._portdb.settings)
+			a = dep_expand(s, settings = FakeSettings())
 		except pe.InvalidAtom:
 			raise InvalidAtomStringError('Incorrect atom: %s' % s)