Use portage.StringIO to avoid duplicate import fallback code.

svn path=/main/trunk/; revision=14931

diff --git a/pym/_emerge/JobStatusDisplay.py b/pym/_emerge/JobStatusDisplay.py
index bcc682b234308642570732cdb3421c0168eb8a9c..288e355f694bda3b184d06e0694592561f188a0c 100644 (file)
--- a/pym/_emerge/JobStatusDisplay.py
+++ b/pym/_emerge/JobStatusDisplay.py
@@ -5,15 +5,9 @@
 import formatter
 import sys
 import time
-try:
-       from io import StringIO
-except ImportError:
-       # Needed for python-2.6 with USE=build since
-       # io imports threading which imports thread
-       # which is unavailable.
-       from StringIO import StringIO
 
 import portage
+from portage import StringIO
 from portage import os
 from portage import _encodings
 from portage import _unicode_decode

diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index dcd2e47c7ae126d1bf5215d481de4dfbd891c863..9a5e931eef3a33a9721170b3502946e9c6180fe5 100644 (file)
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -11,15 +11,8 @@ import textwrap
 import time
 import weakref
 
-try:
-       from io import StringIO
-except ImportError:
-       # Needed for python-2.6 with USE=build since
-       # io imports threading which imports thread
-       # which is unavailable.
-       from StringIO import StringIO
-
 import portage
+from portage import StringIO
 from portage import os
 from portage import _encodings
 from portage import _unicode_decode

diff --git a/pym/portage/util.py b/pym/portage/util.py
index c6e0a31206b6b35565049131b6ca6449844a3518..bb53b078582cd85268e257cefed7fd2796c672a5 100644 (file)
--- a/pym/portage/util.py
+++ b/pym/portage/util.py
@@ -24,15 +24,9 @@ import shlex
 import stat
 import string
 import sys
-try:
-       from io import StringIO
-except ImportError:
-       # Needed for python-2.6 with USE=build since
-       # io imports threading which imports thread
-       # which is unavailable.
-       from StringIO import StringIO
 
 import portage
+from portage import StringIO
 from portage import os
 from portage import _encodings
 from portage import _os_merge