diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-07-10 16:26:24 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-07-10 16:55:05 -0700 |
| commit | 8cc8d12a674ab6271183e5c35202263a36497279 (patch) | |
| tree | 22365e2c613d04151a2d2da5ff3e25e37f84c554 /pym/portage/util/ExtractKernelVersion.py | |
| parent | 906b62b24d8a845356d59abc5acd39db2174ce0f (diff) | |
| download | portage-8cc8d12a674ab6271183e5c35202263a36497279.tar.gz portage-8cc8d12a674ab6271183e5c35202263a36497279.tar.bz2 portage-8cc8d12a674ab6271183e5c35202263a36497279.zip | |
Migrate from codecs.open() to io.open().
The io.open() function is the same as the built-in open() function in
python3, and its implementation is optimized in python-2.7 and later.
In addition to the possible performance improvement, this also allows
us to avoid any future compatibility issues with codecs.open() that
may arise if it is delegated to the built-in open() function as
discussed in PEP 400.
The main caveat involved with io.open() is that TextIOWrapper.write()
raises TypeError if given raw bytes, unlike the streams returned from
codecs.open(). This is mainly an issue for python2 since literal
strings are raw bytes. We handle this by wrapping TextIOWrapper.write()
arguments with our _unicode_decode() function. Also, the
atomic_ofstream class overrides the write() method in python2 so that
it performs automatic coercion to unicode when necessary.
Diffstat (limited to 'pym/portage/util/ExtractKernelVersion.py')
| -rw-r--r-- | pym/portage/util/ExtractKernelVersion.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/portage/util/ExtractKernelVersion.py b/pym/portage/util/ExtractKernelVersion.py index 1cdb8bf13..5cb9747e6 100644 --- a/pym/portage/util/ExtractKernelVersion.py +++ b/pym/portage/util/ExtractKernelVersion.py @@ -1,9 +1,9 @@ -# Copyright 2010 Gentoo Foundation +# Copyright 2010-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 __all__ = ['ExtractKernelVersion'] -import codecs +import io from portage import os, _encodings, _unicode_encode from portage.util import getconfig, grabfile @@ -22,7 +22,7 @@ def ExtractKernelVersion(base_dir): lines = [] pathname = os.path.join(base_dir, 'Makefile') try: - f = codecs.open(_unicode_encode(pathname, + f = io.open(_unicode_encode(pathname, encoding=_encodings['fs'], errors='strict'), mode='r', encoding=_encodings['content'], errors='replace') except OSError as details: |