From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 6 Dec 2009 11:01:14 +0000 (-0000)
Subject: Use portage.StringIO to avoid duplicate import fallback code. (trunk r14931)
X-Git-Tag: v2.1.7.11~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=37cd9d3b76c6be187e84221d0817d1da63a4f4a5;p=portage.git

Use portage.StringIO to avoid duplicate import fallback code. (trunk r14931)

svn path=/main/branches/2.1.7/; revision=14945
---

diff --git a/pym/_emerge/JobStatusDisplay.py b/pym/_emerge/JobStatusDisplay.py
index bcc682b23..288e355f6 100644
--- 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 e6ad72f96..6542822f4 100644
--- 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 c6e0a3120..bb53b0785 100644
--- 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