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/glsa.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pym/portage/glsa.py') diff --git a/pym/portage/glsa.py b/pym/portage/glsa.py index 7e7f4976e..a784d14e1 100644 --- a/pym/portage/glsa.py +++ b/pym/portage/glsa.py @@ -1,9 +1,9 @@ -# Copyright 2003-2010 Gentoo Foundation +# Copyright 2003-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import absolute_import -import codecs +import io import sys try: from urllib.request import urlopen as urllib_request_urlopen @@ -668,12 +668,12 @@ class Glsa: @returns: None """ if not self.isApplied(): - checkfile = codecs.open( + checkfile = io.open( _unicode_encode(os.path.join(self.config["EROOT"], CACHE_PATH, "glsa"), encoding=_encodings['fs'], errors='strict'), mode='a+', encoding=_encodings['content'], errors='strict') - checkfile.write(self.nr+"\n") + checkfile.write(_unicode_decode(self.nr + "\n")) checkfile.close() return None -- cgit v1.2.3-1-g7c22