summaryrefslogtreecommitdiffstats
path: root/pym/_emerge/unmerge.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-08-11 08:32:14 +0000
committerZac Medico <zmedico@gentoo.org>2009-08-11 08:32:14 +0000
commit4f464c6cb06493b49e8475a09d3d9815c97a7d96 (patch)
tree518210f51cba0c7234e108663a1de717ac59feaf /pym/_emerge/unmerge.py
parentf1131534819bcd66c34b738be2e9e57d901c40d4 (diff)
downloadportage-4f464c6cb06493b49e8475a09d3d9815c97a7d96.tar.gz
portage-4f464c6cb06493b49e8475a09d3d9815c97a7d96.tar.bz2
portage-4f464c6cb06493b49e8475a09d3d9815c97a7d96.zip
Update imports to import portage.os (with unicode wrappers), and use
_unicode_encode() and _unicode_decode() where appropriate. svn path=/main/trunk/; revision=13995
Diffstat (limited to 'pym/_emerge/unmerge.py')
-rw-r--r--pym/_emerge/unmerge.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py
index 667e5a517..25c3e4e4f 100644
--- a/pym/_emerge/unmerge.py
+++ b/pym/_emerge/unmerge.py
@@ -3,18 +3,11 @@
# $Id$
import logging
-import os
import sys
import textwrap
from itertools import izip
-
-try:
- import portage
-except ImportError:
- from os import path as osp
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
- import portage
-
+import portage
+from portage import os
from portage.output import bold, colorize, darkgreen, green
from portage.sets import SETPREFIX
from portage.util import cmp_sort_key