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/changelog.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/changelog.py')
-rw-r--r-- | pym/_emerge/changelog.py | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pym/_emerge/changelog.py b/pym/_emerge/changelog.py index 762cae024..4adb8b25b 100644 --- a/pym/_emerge/changelog.py +++ b/pym/_emerge/changelog.py @@ -3,16 +3,10 @@ # $Id$ import codecs -import os import re -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 def calc_changelog(ebuildpath,current,next): if ebuildpath == None or not os.path.exists(ebuildpath): @@ -25,8 +19,8 @@ def calc_changelog(ebuildpath,current,next): next = next[:-3] changelogpath = os.path.join(os.path.split(ebuildpath)[0],'ChangeLog') try: - changelog = codecs.open(changelogpath, mode='r', - encoding='utf_8', errors='replace').read() + changelog = codecs.open(portage._unicode_encode(changelogpath), + mode='r', encoding='utf_8', errors='replace').read() except SystemExit, e: raise # Needed else can't exit except: |