From 5df96179611ce0e98727945b1800b43daccedfc2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 12 Jul 2011 01:41:09 -0700 Subject: Remove python-2.6 StringIO.StringIO fallback. Since the io module in python-2.6 was broken when threading was disabled, we needed to fall back from io.StringIO to StringIO.StringIO in this case (typically just for Gentoo's stage1 and stage2 tarballs). Now that python-2.7 is stable in stages and we rely on io.open() being available, we can also rely on io.StringIO being available. --- bin/repoman | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/repoman b/bin/repoman index 3e0203681..f1fbc2444 100755 --- a/bin/repoman +++ b/bin/repoman @@ -55,7 +55,6 @@ from portage import os from portage import subprocess_getstatusoutput from portage import _encodings from portage import _unicode_encode -from portage import StringIO from repoman.checks import run_checks from repoman import utilities from repoman.herdbase import make_herd_base @@ -2011,7 +2010,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() +qa_output = io.StringIO() style_file = ConsoleStyleFile(sys.stdout) if options.mode == 'commit' and \ (not commitmessage or not commitmessage.strip()): -- cgit v1.2.3-1-g7c22