From 71235479ab208318dff391420f9695f5cfaa9594 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 18 Jan 2013 13:33:08 -0800
Subject: Use unicode_literals more.

This helps to ensure consistent results, regardless of whether we're
using Python 2 or Python 3.
---
 pym/portage/util/digraph.py  | 12 ++++++------
 pym/portage/util/movefile.py | 12 +++++++-----
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'pym/portage/util')

diff --git a/pym/portage/util/digraph.py b/pym/portage/util/digraph.py
index f3ae658c9..f752e28a8 100644
--- a/pym/portage/util/digraph.py
+++ b/pym/portage/util/digraph.py
@@ -1,12 +1,13 @@
-# Copyright 2010-2011 Gentoo Foundation
+# Copyright 2010-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+from __future__ import unicode_literals
+
 __all__ = ['digraph']
 
 from collections import deque
 import sys
 
-from portage import _unicode_decode
 from portage.util import writemsg
 
 class digraph(object):
@@ -272,18 +273,17 @@ class digraph(object):
 	def debug_print(self):
 		def output(s):
 			writemsg(s, noiselevel=-1)
-		# Use _unicode_decode() to force unicode format
+		# Use unicode_literals to force unicode format
 		# strings for python-2.x safety, ensuring that
 		# node.__unicode__() is used when necessary.
 		for node in self.nodes:
-			output(_unicode_decode("%s ") % (node,))
+			output("%s " % (node,))
 			if self.nodes[node][0]:
 				output("depends on\n")
 			else:
 				output("(no children)\n")
 			for child, priorities in self.nodes[node][0].items():
-				output(_unicode_decode("  %s (%s)\n") % \
-					(child, priorities[-1],))
+				output("  %s (%s)\n" % (child, priorities[-1],))
 
 	def bfs(self, start, ignore_priority=None):
 		if start not in self:
diff --git a/pym/portage/util/movefile.py b/pym/portage/util/movefile.py
index 57375f219..bf95f1a40 100644
--- a/pym/portage/util/movefile.py
+++ b/pym/portage/util/movefile.py
@@ -1,6 +1,8 @@
-# Copyright 2010-2012 Gentoo Foundation
+# Copyright 2010-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+from __future__ import unicode_literals
+
 __all__ = ['movefile']
 
 import errno
@@ -111,7 +113,7 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None,
 	except Exception as e:
 		writemsg("!!! %s\n" % _("Stating source file failed... movefile()"),
 			noiselevel=-1)
-		writemsg(_unicode_decode("!!! %s\n") % (e,), noiselevel=-1)
+		writemsg("!!! %s\n" % (e,), noiselevel=-1)
 		return None
 
 	destexists=1
@@ -180,7 +182,7 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None,
 			writemsg("!!! %s\n" % _("failed to properly create symlink:"),
 				noiselevel=-1)
 			writemsg("!!! %s -> %s\n" % (dest, target), noiselevel=-1)
-			writemsg(_unicode_decode("!!! %s\n") % (e,), noiselevel=-1)
+			writemsg("!!! %s\n" % (e,), noiselevel=-1)
 			return None
 
 	hardlinked = False
@@ -232,7 +234,7 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None,
 				# Some random error.
 				writemsg("!!! %s\n" % _("Failed to move %(src)s to %(dest)s") %
 					{"src": src, "dest": dest}, noiselevel=-1)
-				writemsg(_unicode_decode("!!! %s\n") % (e,), noiselevel=-1)
+				writemsg("!!! %s\n" % (e,), noiselevel=-1)
 				return None
 			# Invalid cross-device-link 'bind' mounted or actually Cross-Device
 	if renamefailed:
@@ -263,7 +265,7 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None,
 			except Exception as e:
 				writemsg("!!! %s\n" % _('copy %(src)s -> %(dest)s failed.') %
 					{"src": src, "dest": dest}, noiselevel=-1)
-				writemsg(_unicode_decode("!!! %s\n") % (e,), noiselevel=-1)
+				writemsg("!!! %s\n" % (e,), noiselevel=-1)
 				return None
 		else:
 			#we don't yet handle special, so we need to fall back to /bin/mv
-- 
cgit v1.2.3-1-g7c22