From 05e04a148b0f3dac7fc484334a2d89b6f9624827 Mon Sep 17 00:00:00 2001 From: Zac Medico 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/EbuildPhase.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'pym/_emerge/EbuildPhase.py') diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py index 22b9f8bcb..598dcf7e3 100644 --- a/pym/_emerge/EbuildPhase.py +++ b/pym/_emerge/EbuildPhase.py @@ -6,15 +6,10 @@ from _emerge.MiscFunctionsProcess import MiscFunctionsProcess from _emerge.EbuildProcess import EbuildProcess from _emerge.CompositeTask import CompositeTask from portage.util import writemsg -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 portage +from portage import os import codecs -import os + class EbuildPhase(CompositeTask): __slots__ = ("background", "pkg", "phase", -- cgit v1.2.3-1-g7c22