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.

1 files changed, 3 insertions, 3 deletions

diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_MergeProcess.py
index 3b9ad8284..34ed03157 100644
--- a/pym/portage/dbapi/_MergeProcess.py
+++ b/pym/portage/dbapi/_MergeProcess.py
@@ -1,16 +1,16 @@
 # Copyright 2010-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+import io
 import shutil
 import signal
-import sys
 import tempfile
 import traceback
 
 import errno
 import fcntl
 import portage
-from portage import os, StringIO, _unicode_decode
+from portage import os, _unicode_decode
 from portage.const import PORTAGE_PACKAGE_ATOM
 from portage.dep import match_from_list
 import portage.elog.messages
@@ -134,7 +134,7 @@ class MergeProcess(SpawnProcess):
 			else:
 				lines[0] = self._buf + lines[0]
 				self._buf = lines.pop()
-				out = StringIO()
+				out = io.StringIO()
 				for line in lines:
 					funcname, phase, key, msg = line.split(' ', 3)
 					self._elog_keys.add(key)