diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-12-06 11:01:14 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-12-06 11:01:14 +0000 |
| commit | 37cd9d3b76c6be187e84221d0817d1da63a4f4a5 (patch) | |
| tree | 1e95df8897d6ad46d917de98677be1774328a0c5 | |
| parent | Move code for handling missing sandbox binary out of the config constructor. (diff) | |
| download | portage-multirepo-37cd9d3b76c6be187e84221d0817d1da63a4f4a5.tar.gz portage-multirepo-37cd9d3b76c6be187e84221d0817d1da63a4f4a5.tar.bz2 portage-multirepo-37cd9d3b76c6be187e84221d0817d1da63a4f4a5.zip | |
Use portage.StringIO to avoid duplicate import fallback code. (trunk r14931)
svn path=/main/branches/2.1.7/; revision=14945
| -rw-r--r-- | pym/_emerge/JobStatusDisplay.py | 8 | ||||
| -rw-r--r-- | pym/_emerge/Scheduler.py | 9 | ||||
| -rw-r--r-- | pym/portage/util.py | 8 |
3 files changed, 3 insertions, 22 deletions
diff --git a/pym/_emerge/JobStatusDisplay.py b/pym/_emerge/JobStatusDisplay.py index bcc682b2..288e355f 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 e6ad72f9..6542822f 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 c6e0a312..bb53b078 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 |