From 8cc8d12a674ab6271183e5c35202263a36497279 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 10 Jul 2011 16:26:24 -0700 Subject: 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. --- pym/portage/env/loaders.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pym/portage/env') diff --git a/pym/portage/env/loaders.py b/pym/portage/env/loaders.py index 81dd5b172..b540fbbd3 100644 --- a/pym/portage/env/loaders.py +++ b/pym/portage/env/loaders.py @@ -1,9 +1,9 @@ # config.py -- Portage Config -# Copyright 2007 Gentoo Foundation +# Copyright 2007-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -import codecs import errno +import io import stat from portage import os from portage import _encodings @@ -149,7 +149,7 @@ class FileLoader(DataLoader): func = self.lineParser for fn in RecursiveFileLoader(self.fname): try: - f = codecs.open(_unicode_encode(fn, + f = io.open(_unicode_encode(fn, encoding=_encodings['fs'], errors='strict'), mode='r', encoding=_encodings['content'], errors='replace') except EnvironmentError as e: -- cgit v1.2.3-1-g7c22