diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-08-20 23:09:43 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-08-20 23:09:43 +0000 |
| commit | b12ad1c74a820196faa930353cdd021a33cb6958 (patch) | |
| tree | 15935d9a3628e91d73e6858468c0f915982936cc /pym/_emerge/changelog.py | |
| parent | f3392a373d255aa14b86a777ee62ae9a067907d2 (diff) | |
| download | portage-b12ad1c74a820196faa930353cdd021a33cb6958.tar.gz portage-b12ad1c74a820196faa930353cdd021a33cb6958.tar.bz2 portage-b12ad1c74a820196faa930353cdd021a33cb6958.zip | |
Use _encodings where appropriate.
svn path=/main/trunk/; revision=14106
Diffstat (limited to 'pym/_emerge/changelog.py')
| -rw-r--r-- | pym/_emerge/changelog.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pym/_emerge/changelog.py b/pym/_emerge/changelog.py index 4adb8b25b..0fdf5880a 100644 --- a/pym/_emerge/changelog.py +++ b/pym/_emerge/changelog.py @@ -7,6 +7,8 @@ import re import portage from portage import os +from portage import _encodings +from portage import _unicode_encode def calc_changelog(ebuildpath,current,next): if ebuildpath == None or not os.path.exists(ebuildpath): @@ -19,8 +21,10 @@ def calc_changelog(ebuildpath,current,next): next = next[:-3] changelogpath = os.path.join(os.path.split(ebuildpath)[0],'ChangeLog') try: - changelog = codecs.open(portage._unicode_encode(changelogpath), - mode='r', encoding='utf_8', errors='replace').read() + changelog = codecs.open(_unicode_encode(changelogpath, + encoding=_encodings['fs'], errors='strict'), + mode='r', encoding=_encodings['repo.content'], errors='replace' + ).read() except SystemExit, e: raise # Needed else can't exit except: |