diff options
Diffstat (limited to 'pym/portage/package/ebuild')
| -rw-r--r-- | pym/portage/package/ebuild/_config/LocationsManager.py | 6 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/deprecated_profile_check.py | 6 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 21 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/fetch.py | 6 |
4 files changed, 19 insertions, 20 deletions
diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py index 14cfaa672..c2b115bb0 100644 --- a/pym/portage/package/ebuild/_config/LocationsManager.py +++ b/pym/portage/package/ebuild/_config/LocationsManager.py @@ -1,11 +1,11 @@ -# Copyright 2010 Gentoo Foundation +# Copyright 2010-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 __all__ = ( 'LocationsManager', ) -import codecs +import io from portage import os, eapi_is_supported, _encodings, _unicode_encode from portage.const import CUSTOM_PROFILE_PATH, GLOBAL_CONFIG_PATH, \ PROFILE_PATH, USER_CONFIG_PATH @@ -90,7 +90,7 @@ class LocationsManager(object): parentsFile = os.path.join(currentPath, "parent") eapi_file = os.path.join(currentPath, "eapi") try: - eapi = codecs.open(_unicode_encode(eapi_file, + eapi = io.open(_unicode_encode(eapi_file, encoding=_encodings['fs'], errors='strict'), mode='r', encoding=_encodings['content'], errors='replace' ).readline().strip() diff --git a/pym/portage/package/ebuild/deprecated_profile_check.py b/pym/portage/package/ebuild/deprecated_profile_check.py index 7da5fe848..3fab4da6e 100644 --- a/pym/portage/package/ebuild/deprecated_profile_check.py +++ b/pym/portage/package/ebuild/deprecated_profile_check.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__ = ['deprecated_profile_check'] -import codecs +import io from portage import os, _encodings, _unicode_encode from portage.const import DEPRECATED_PROFILE_FILE @@ -19,7 +19,7 @@ def deprecated_profile_check(settings=None): DEPRECATED_PROFILE_FILE) if not os.access(deprecated_profile_file, os.R_OK): return False - dcontent = codecs.open(_unicode_encode(deprecated_profile_file, + dcontent = io.open(_unicode_encode(deprecated_profile_file, encoding=_encodings['fs'], errors='strict'), mode='r', encoding=_encodings['content'], errors='replace').readlines() writemsg(colorize("BAD", _("\n!!! Your current profile is " diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index 28ae459b7..53a3f9acf 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -3,9 +3,9 @@ __all__ = ['doebuild', 'doebuild_environment', 'spawn', 'spawnebuild'] -import codecs import gzip import errno +import io from itertools import chain import logging import os as _os @@ -30,7 +30,7 @@ portage.proxy.lazyimport.lazyimport(globals(), 'portage.util.ExtractKernelVersion:ExtractKernelVersion' ) -from portage import auxdbkeys, bsd_chflags, dep_check, \ +from portage import auxdbkeys, bsd_chflags, \ eapi_is_supported, merge, os, selinux, \ unmerge, _encodings, _parse_eapi_ebuild_head, _os_merge, \ _shell_quote, _unicode_decode, _unicode_encode @@ -39,7 +39,6 @@ from portage.const import EBUILD_SH_ENV_FILE, EBUILD_SH_ENV_DIR, \ from portage.data import portage_gid, portage_uid, secpass, \ uid, userpriv_groups from portage.dbapi.porttree import _parse_uri_map -from portage.dbapi.virtual import fakedbapi from portage.dep import Atom, check_required_use, \ human_readable_required_use, paren_enclose, use_reduce from portage.eapi import eapi_exports_KV, eapi_exports_merge_type, \ @@ -290,7 +289,7 @@ def doebuild_environment(myebuild, mydo, myroot=None, settings=None, if mydo == 'depend' and 'EAPI' not in mysettings.configdict['pkg']: if eapi is None and 'parse-eapi-ebuild-head' in mysettings.features: eapi = _parse_eapi_ebuild_head( - codecs.open(_unicode_encode(ebuild_path, + io.open(_unicode_encode(ebuild_path, encoding=_encodings['fs'], errors='strict'), mode='r', encoding=_encodings['content'], errors='replace')) @@ -1586,15 +1585,15 @@ def _post_src_install_uid_fix(mysettings, out): build_info_dir = os.path.join(mysettings['PORTAGE_BUILDDIR'], 'build-info') - codecs.open(_unicode_encode(os.path.join(build_info_dir, + io.open(_unicode_encode(os.path.join(build_info_dir, 'SIZE'), encoding=_encodings['fs'], errors='strict'), 'w', encoding=_encodings['repo.content'], - errors='strict').write(str(size) + '\n') + errors='strict').write(_unicode_decode(str(size) + '\n')) - codecs.open(_unicode_encode(os.path.join(build_info_dir, + io.open(_unicode_encode(os.path.join(build_info_dir, 'BUILD_TIME'), encoding=_encodings['fs'], errors='strict'), 'w', encoding=_encodings['repo.content'], - errors='strict').write(str(int(time.time())) + '\n') + errors='strict').write(_unicode_decode(str(int(time.time())) + '\n')) use = frozenset(mysettings['PORTAGE_USE'].split()) for k in _vdb_use_conditional_keys: @@ -1620,10 +1619,10 @@ def _post_src_install_uid_fix(mysettings, out): except OSError: pass continue - codecs.open(_unicode_encode(os.path.join(build_info_dir, + io.open(_unicode_encode(os.path.join(build_info_dir, k), encoding=_encodings['fs'], errors='strict'), mode='w', encoding=_encodings['repo.content'], - errors='strict').write(v + '\n') + errors='strict').write(_unicode_decode(v + '\n')) _reapply_bsdflags_to_image(mysettings) @@ -1649,7 +1648,7 @@ def _post_src_install_soname_symlinks(mysettings, out): "build-info", "NEEDED.ELF.2") try: - lines = codecs.open(_unicode_encode(needed_filename, + lines = io.open(_unicode_encode(needed_filename, encoding=_encodings['fs'], errors='strict'), 'r', encoding=_encodings['repo.content'], errors='replace').readlines() diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py index 7bc95eb4f..658b3eb2b 100644 --- a/pym/portage/package/ebuild/fetch.py +++ b/pym/portage/package/ebuild/fetch.py @@ -5,8 +5,8 @@ from __future__ import print_function __all__ = ['fetch'] -import codecs import errno +import io import logging import random import re @@ -31,7 +31,7 @@ from portage.const import BASH_BINARY, CUSTOM_MIRRORS_FILE, \ GLOBAL_CONFIG_PATH from portage.data import portage_gid, portage_uid, secpass, userpriv_groups from portage.exception import FileNotFound, OperationNotPermitted, \ - PermissionDenied, PortageException, TryAgain + PortageException, TryAgain from portage.localization import _ from portage.locks import lockfile, unlockfile from portage.manifest import Manifest @@ -1008,7 +1008,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, # Fetch failed... Try the next one... Kill 404 files though. if (mystat[stat.ST_SIZE]<100000) and (len(myfile)>4) and not ((myfile[-5:]==".html") or (myfile[-4:]==".htm")): html404=re.compile("<title>.*(not found|404).*</title>",re.I|re.M) - if html404.search(codecs.open( + if html404.search(io.open( _unicode_encode(myfile_path, encoding=_encodings['fs'], errors='strict'), mode='r', encoding=_encodings['content'], errors='replace' |