[gentoo-commits] proj/portage:master commit in: pym/portage/util/

[Zac Medico]

commit:     09bdb69ac31146cbb3f258118a1aea0744b96379
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue May  1 21:21:44 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue May  1 21:21:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=09bdb69a

validate_desktop_entry: handle Python 3.1

---
 pym/portage/util/_desktop_entry.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/pym/portage/util/_desktop_entry.py b/pym/portage/util/_desktop_entry.py
index 101965f..7901780 100644
--- a/pym/portage/util/_desktop_entry.py
+++ b/pym/portage/util/_desktop_entry.py
@@ -3,6 +3,7 @@
 
 import io
 import subprocess
+import sys
 
 try:
 	from configparser import Error as ConfigParserError, RawConfigParser
@@ -41,7 +42,11 @@ _ignored_service_errors = (
 )
 
 def validate_desktop_entry(path):
-	proc = subprocess.Popen([b"desktop-file-validate", _unicode_encode(path)],
+	args = ["desktop-file-validate", path]
+	if sys.hexversion < 0x3000000 or sys.hexversion >= 0x3020000:
+		# Python 3.1 does not support bytes in Popen args.
+		args = [_unicode_encode(x, errors='strict') for x in args]
+	proc = subprocess.Popen(args,
 		stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 	output_lines = _unicode_decode(proc.communicate()[0]).splitlines()
 	proc.wait()