diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-07-12 01:41:09 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-07-12 01:41:09 -0700 |
| commit | 5df96179611ce0e98727945b1800b43daccedfc2 (patch) | |
| tree | e60d86543cf61b8f8fa93858c4068b2305a6769b /bin | |
| parent | 428053ee44e4a14b3c74dc8e541bcb062b31a799 (diff) | |
| download | portage-5df96179611ce0e98727945b1800b43daccedfc2.tar.gz portage-5df96179611ce0e98727945b1800b43daccedfc2.tar.bz2 portage-5df96179611ce0e98727945b1800b43daccedfc2.zip | |
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.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/repoman | 3 |
1 files changed, 1 insertions, 2 deletions
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()): |