From e8da78af846bac21363c85d4bee5d938844843be Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 28 Oct 2011 13:13:07 -0700 Subject: Check for bytes instead of unicode in args. This simplifies the checks since the bytes type is available in all supported python versions, while the unicode type is only available in python2. --- bin/lock-helper.py | 4 ++-- bin/portageq | 2 +- pym/_emerge/main.py | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bin/lock-helper.py b/bin/lock-helper.py index 5f3ea9f09..065ddcbc4 100755 --- a/bin/lock-helper.py +++ b/bin/lock-helper.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# Copyright 2010 Gentoo Foundation +# Copyright 2010-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import os @@ -9,7 +9,7 @@ import portage def main(args): - if args and sys.hexversion < 0x3000000 and not isinstance(args[0], unicode): + if args and isinstance(args[0], bytes): for i, x in enumerate(args): args[i] = portage._unicode_decode(x, errors='strict') diff --git a/bin/portageq b/bin/portageq index 02f19040c..40cc21d27 100755 --- a/bin/portageq +++ b/bin/portageq @@ -847,7 +847,7 @@ def main(): os.environ["ROOT"] = root args = sys.argv[2:] - if args and sys.hexversion < 0x3000000 and not isinstance(args[0], unicode): + if args and isinstance(args[0], bytes): for i in range(len(args)): args[i] = portage._unicode_decode(args[i]) diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 0dfc5f998..162f70ffd 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -1233,8 +1233,7 @@ def parse_opts(tmpcmdline, silent=False): if myaction is None and myoptions.deselect is True: myaction = 'deselect' - if myargs and sys.hexversion < 0x3000000 and \ - not isinstance(myargs[0], unicode): + if myargs and isinstance(myargs[0], bytes): for i in range(len(myargs)): myargs[i] = portage._unicode_decode(myargs[i]) -- cgit v1.2.3-1-g7c22