summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-08-06 22:39:16 +0000
committerZac Medico <zmedico@gentoo.org>2009-08-06 22:39:16 +0000
commit5c204ae352691ba5bfe1df0e7d3440f048c7d934 (patch)
tree65a2acc70aeb4d297ce097b5d98ddfeaa945aa78
parentb7f246972d6047403bfa507e21644b2004e0c2be (diff)
downloadportage-5c204ae352691ba5bfe1df0e7d3440f048c7d934.tar.gz
portage-5c204ae352691ba5bfe1df0e7d3440f048c7d934.tar.bz2
portage-5c204ae352691ba5bfe1df0e7d3440f048c7d934.zip
In shlex_split(), don't encode unicode for py3k. Thanks to Arfrever.
svn path=/main/trunk/; revision=13942
-rw-r--r--pym/portage/util.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/util.py b/pym/portage/util.py
index df66723ec..780c9b5f1 100644
--- a/pym/portage/util.py
+++ b/pym/portage/util.py
@@ -355,7 +355,7 @@ def shlex_split(s):
This is equivalent to shlex.split but it temporarily encodes unicode
strings to bytes since shlex.split() doesn't handle unicode strings.
"""
- is_unicode = isinstance(s, unicode)
+ is_unicode = sys.hexversion < 0x3000000 and isinstance(s, unicode)
if is_unicode:
s = s.encode('utf_8', 'replace')
rval = shlex.split(s)