[gentoo-commits] proj/portage:multilib commit in: pym/portage/cache/, pym/portage/tests/lint/

[Thomas Sachau]

commit:     a074dc39f5bef8285035b739671fc32910fff733
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 31 07:46:45 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Jan 31 07:46:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a074dc39

ebuild_xattr: lazily import xattr

---
 pym/portage/cache/ebuild_xattr.py             |    6 ++++--
 pym/portage/tests/lint/test_import_modules.py |    1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pym/portage/cache/ebuild_xattr.py b/pym/portage/cache/ebuild_xattr.py
index e55ac3e..1d7e26f 100644
--- a/pym/portage/cache/ebuild_xattr.py
+++ b/pym/portage/cache/ebuild_xattr.py
@@ -1,17 +1,19 @@
-# Copyright: 2009-2010 Gentoo Foundation
+# Copyright: 2009-2011 Gentoo Foundation
 # Author(s): Petteri R&#228;ty (betelgeuse@g.o)
 # License: GPL2
 
 __all__ = ['database']
 
+import portage
 from portage.cache import fs_template
 from portage.versions import catsplit
 from portage import cpv_getkey
 from portage import os
 from portage import _encodings
 from portage import _unicode_decode
-import xattr
 from errno import ENODATA,ENOSPC,E2BIG
+portage.proxy.lazyimport.lazyimport(globals(),
+	'xattr')
 
 class NoValueException(Exception):
 	pass

diff --git a/pym/portage/tests/lint/test_import_modules.py b/pym/portage/tests/lint/test_import_modules.py
index c0551c7..87bb4bf 100644
--- a/pym/portage/tests/lint/test_import_modules.py
+++ b/pym/portage/tests/lint/test_import_modules.py
@@ -11,7 +11,6 @@ class ImportModulesTestCase(TestCase):
 
 	def testImportModules(self):
 		expected_failures = frozenset((
-			"portage.cache.ebuild_xattr", 	#automagic dep on xattr
 		))
 
 		for mod in self._list_modules(PORTAGE_PYM_PATH):