summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-02-20 07:16:16 +0000
committerZac Medico <zmedico@gentoo.org>2009-02-20 07:16:16 +0000
commitff11bfce39a7b86c0d00ecc2d3909665c58dc85d (patch)
tree7fa47c05d6a69e6a096855a8c12ab76edf4e64ca /bin/repoman
parentAdd a new portage.utils.lazy_import() function which behaves similar to the (diff)
downloadportage-idfetch-ff11bfce39a7b86c0d00ecc2d3909665c58dc85d.tar.gz
portage-idfetch-ff11bfce39a7b86c0d00ecc2d3909665c58dc85d.tar.bz2
portage-idfetch-ff11bfce39a7b86c0d00ecc2d3909665c58dc85d.zip
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
Diffstat (limited to 'bin/repoman')
-rwxr-xr-xbin/repoman6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/repoman b/bin/repoman
index 46d5f452..eaa03f74 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()):