diff options
| author | Zac Medico <zmedico@gentoo.org> | 2013-01-18 13:33:08 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-01-18 13:36:47 -0800 |
| commit | 71235479ab208318dff391420f9695f5cfaa9594 (patch) | |
| tree | d36bc22802e3b13c8ca5dce4328540a287c6eb3f /pym/portage/package/ebuild/doebuild.py | |
| parent | 0d732def5d30b29ab2941f0c66919a3ec4e8eb02 (diff) | |
| download | portage-71235479ab208318dff391420f9695f5cfaa9594.tar.gz portage-71235479ab208318dff391420f9695f5cfaa9594.tar.bz2 portage-71235479ab208318dff391420f9695f5cfaa9594.zip | |
Use unicode_literals more.
This helps to ensure consistent results, regardless of whether we're
using Python 2 or Python 3.
Diffstat (limited to 'pym/portage/package/ebuild/doebuild.py')
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index bef19892c..3e8ff0138 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -1,6 +1,8 @@ # Copyright 2010-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +from __future__ import unicode_literals + __all__ = ['doebuild', 'doebuild_environment', 'spawn', 'spawnebuild'] import grp @@ -1742,7 +1744,7 @@ def _post_src_install_write_metadata(settings): 'BUILD_TIME'), encoding=_encodings['fs'], errors='strict'), mode='w', encoding=_encodings['repo.content'], errors='strict') as f: - f.write(_unicode_decode("%.0f\n" % (time.time(),))) + f.write("%.0f\n" % (time.time(),)) use = frozenset(settings['PORTAGE_USE'].split()) for k in _vdb_use_conditional_keys: @@ -1774,7 +1776,7 @@ def _post_src_install_write_metadata(settings): k), encoding=_encodings['fs'], errors='strict'), mode='w', encoding=_encodings['repo.content'], errors='strict') as f: - f.write(_unicode_decode(v + '\n')) + f.write('%s\n' % v) if eapi_attrs.slot_operator: deps = evaluate_slot_operator_equal_deps(settings, use, QueryCommand.get_db()) @@ -1790,7 +1792,7 @@ def _post_src_install_write_metadata(settings): k), encoding=_encodings['fs'], errors='strict'), mode='w', encoding=_encodings['repo.content'], errors='strict') as f: - f.write(_unicode_decode(v + '\n')) + f.write('%s\n' % v) def _preinst_bsdflags(mysettings): if bsd_chflags: @@ -1999,7 +2001,7 @@ def _post_src_install_uid_fix(mysettings, out): 'SIZE'), encoding=_encodings['fs'], errors='strict'), mode='w', encoding=_encodings['repo.content'], errors='strict') - f.write(_unicode_decode(str(size) + '\n')) + f.write('%d\n' % size) f.close() _reapply_bsdflags_to_image(mysettings) |