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 /bin | |
| 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 'bin')
| -rwxr-xr-x | bin/portageq | 10 | ||||
| -rwxr-xr-x | bin/repoman | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/bin/portageq b/bin/portageq index ee776ef4f..826c92d12 100755 --- a/bin/portageq +++ b/bin/portageq @@ -2,7 +2,7 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import print_function +from __future__ import print_function, unicode_literals import signal import sys @@ -101,9 +101,7 @@ def has_version(argv): try: atom = portage.dep.Atom(argv[1], allow_repo=allow_repo, eapi=eapi) except portage.exception.InvalidAtom as e: - warnings.append( - portage._unicode_decode("QA Notice: %s: %s") % \ - ('has_version', e)) + warnings.append("QA Notice: %s: %s" % ('has_version', e)) atom = eval_atom_use(atom) if warnings: @@ -149,9 +147,7 @@ def best_version(argv): try: atom = portage.dep.Atom(argv[1], allow_repo=allow_repo, eapi=eapi) except portage.exception.InvalidAtom as e: - warnings.append( - portage._unicode_decode("QA Notice: %s: %s") % \ - ('best_version', e)) + warnings.append("QA Notice: %s: %s" % ('best_version', e)) atom = eval_atom_use(atom) if warnings: diff --git a/bin/repoman b/bin/repoman index 4c00d5bca..11f2b13bb 100755 --- a/bin/repoman +++ b/bin/repoman @@ -6,7 +6,7 @@ # Then, check to make sure deps are satisfiable (to avoid "can't find match for" problems) # that last one is tricky because multiple profiles need to be checked. -from __future__ import print_function +from __future__ import print_function, unicode_literals import calendar import codecs |