diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-08-11 08:32:14 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-08-11 08:32:14 +0000 |
| commit | 4f464c6cb06493b49e8475a09d3d9815c97a7d96 (patch) | |
| tree | 518210f51cba0c7234e108663a1de717ac59feaf /pym/_emerge/main.py | |
| parent | f1131534819bcd66c34b738be2e9e57d901c40d4 (diff) | |
| download | portage-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/main.py')
| -rw-r--r-- | pym/_emerge/main.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 909cb5eae..8e9a8a22a 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -6,16 +6,9 @@ import logging import signal import sys import textwrap -import os import platform - -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 import _emerge.help import portage.xpak, commands, errno, re, time from portage.output import colorize, xtermTitle, xtermTitleReset @@ -750,7 +743,7 @@ def parse_opts(tmpcmdline, silent=False): if myargs and not isinstance(myargs[0], unicode): for i in xrange(len(myargs)): - myargs[i] = unicode(myargs[i], encoding='utf_8', errors='replace') + myargs[i] = portage._unicode_decode(myargs[i]) myfiles += myargs |