From f1131534819bcd66c34b738be2e9e57d901c40d4 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 11 Aug 2009 08:07:04 +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=13994
---
 pym/_emerge/UninstallFailure.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

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

diff --git a/pym/_emerge/UninstallFailure.py b/pym/_emerge/UninstallFailure.py
index 7dbf1c1c5..ceb5a58e2 100644
--- a/pym/_emerge/UninstallFailure.py
+++ b/pym/_emerge/UninstallFailure.py
@@ -2,14 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-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
+
 class UninstallFailure(portage.exception.PortageException):
 	"""
 	An instance of this class is raised by unmerge() when
-- 
cgit v1.2.3-1-g7c22