From ff11bfce39a7b86c0d00ecc2d3909665c58dc85d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 20 Feb 2009 07:16:16 +0000 Subject: Fix StringIO imports so that 2to3 can handle them. Also, replace shlex + StringIO usage with shlex.split() where appropriate. svn path=/main/trunk/; revision=12662 --- pym/portage/getbinpkg.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pym/portage/getbinpkg.py') diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py index f657c67a1..bb3911a6b 100644 --- a/pym/portage/getbinpkg.py +++ b/pym/portage/getbinpkg.py @@ -400,12 +400,11 @@ def file_get(baseurl,dest,conn=None,fcmd=None): "URI": baseurl, "FILE": os.path.basename(baseurl) } - import shlex, StringIO + import shlex from portage.util import varexpand from portage.process import spawn - lexer = shlex.shlex(StringIO.StringIO(fcmd), posix=True) - lexer.whitespace_split = True - myfetch = [varexpand(x, mydict=variables) for x in lexer] + myfetch = shlex.split(fcmd) + myfetch = [varexpand(x, mydict=variables) for x in myfetch] fd_pipes= { 0:sys.stdin.fileno(), 1:sys.stdout.fileno(), -- cgit v1.2.3-1-g7c22