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/_emerge/resolver/output.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/_emerge/resolver/output.py')
| -rw-r--r-- | pym/_emerge/resolver/output.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index 3d6af66d4..651a4f73c 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -1,9 +1,11 @@ -# Copyright 2010-2012 Gentoo Foundation +# Copyright 2010-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 """Resolver output display operation. """ +from __future__ import unicode_literals + __all__ = ( "Display", ) @@ -11,7 +13,6 @@ __all__ = ( import sys from portage import os -from portage import _unicode_decode from portage.dbapi.dep_expand import dep_expand from portage.dep import cpvequal, _repo_separator, _slot_separator from portage.eapi import _get_eapi_attrs @@ -567,9 +568,9 @@ class Display(object): """ writemsg_stdout('\n%s\n' % (self.counters,), noiselevel=-1) if show_repos: - # Use _unicode_decode() to force unicode format string so + # Use unicode_literals to force unicode format string so # that RepoDisplay.__unicode__() is called in python2. - writemsg_stdout(_unicode_decode("%s") % (self.conf.repo_display,), + writemsg_stdout("%s" % (self.conf.repo_display,), noiselevel=-1) return |