diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:00:59 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:00:59 +0000 |
| commit | 548a5301c6d6390ba11808ee91247c9ab649574a (patch) | |
| tree | af91f6a4638dd8a6a2464f02a93b9055e5a3e2b4 /bin | |
| parent | 87231f133db9f0e286199d5be67bd45292622520 (diff) | |
| download | portage-548a5301c6d6390ba11808ee91247c9ab649574a.tar.gz portage-548a5301c6d6390ba11808ee91247c9ab649574a.tar.bz2 portage-548a5301c6d6390ba11808ee91247c9ab649574a.zip | |
Fix StringIO imports so that 2to3 can handle them. Also, replace shlex +
StringIO usage with shlex.split() where appropriate. (trunk r12662)
svn path=/main/branches/2.1.6/; revision=12925
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/repoman | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/repoman b/bin/repoman index 7b5daf353..4c242c045 100755 --- a/bin/repoman +++ b/bin/repoman @@ -26,9 +26,9 @@ from itertools import chain, izip from stat import S_ISDIR, ST_CTIME try: - import cStringIO as StringIO + from cStringIO import StringIO except ImportError: - import StringIO + from StringIO import StringIO if not hasattr(__builtins__, "set"): from sets import Set as set @@ -1614,7 +1614,7 @@ if dofail or \ # in $EDITOR while the user creates a commit message. # Otherwise, the user would not be able to see this output # once the editor has taken over the screen. -qa_output = StringIO.StringIO() +qa_output = StringIO() style_file = ConsoleStyleFile(sys.stdout) if options.mode == 'commit' and \ (not commitmessage or not commitmessage.strip()): |