diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-08-11 07:47:27 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-08-11 07:47:27 +0000 |
| commit | 05e04a148b0f3dac7fc484334a2d89b6f9624827 (patch) | |
| tree | 07d35efdec1605fac8836b31a4cbc82cb04713b1 /pym/_emerge/EbuildMetadataPhase.py | |
| parent | Avoid using the wrapped os.read(), in order to avoid differing behavior (diff) | |
| download | portage-idfetch-05e04a148b0f3dac7fc484334a2d89b6f9624827.tar.gz portage-idfetch-05e04a148b0f3dac7fc484334a2d89b6f9624827.tar.bz2 portage-idfetch-05e04a148b0f3dac7fc484334a2d89b6f9624827.zip | |
Update imports to import portage.os (with unicode wrappers), and use
_unicode_encode() and _unicode_decode() where appropriate.
svn path=/main/trunk/; revision=13993
Diffstat (limited to 'pym/_emerge/EbuildMetadataPhase.py')
| -rw-r--r-- | pym/_emerge/EbuildMetadataPhase.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetadataPhase.py index 8e488d30..a84d722b 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): """ |