From 05e04a148b0f3dac7fc484334a2d89b6f9624827 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 11 Aug 2009 07:47:27 +0000
Subject: Update imports to import portage.os (with unicode wrappers), and use
 _unicode_encode() and _unicode_decode() where appropriate.

svn path=/main/trunk/; revision=13993
---
 pym/_emerge/EbuildMetadataPhase.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'pym/_emerge/EbuildMetadataPhase.py')

diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetadataPhase.py
index 8e488d306..a84d722be 100644
--- a/pym/_emerge/EbuildMetadataPhase.py
+++ b/pym/_emerge/EbuildMetadataPhase.py
@@ -6,17 +6,12 @@ from _emerge.SubProcess import SubProcess
 from _emerge.PollConstants import PollConstants
 import sys
 from portage.cache.mappings import slot_dict_class
-try:
-	import portage
-except ImportError:
-	from os import path as osp
-	import sys
-	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
-	import portage
-import os
+import portage
+from portage import os
 from itertools import izip
 import fcntl
 import codecs
+
 class EbuildMetadataPhase(SubProcess):
 
 	"""
-- 
cgit v1.2.3-1-g7c22