diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-07-12 01:41:09 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-07-12 01:41:09 -0700 |
| commit | 5df96179611ce0e98727945b1800b43daccedfc2 (patch) | |
| tree | e60d86543cf61b8f8fa93858c4068b2305a6769b /pym/_emerge/BinpkgVerifier.py | |
| parent | 428053ee44e4a14b3c74dc8e541bcb062b31a799 (diff) | |
| download | portage-5df96179611ce0e98727945b1800b43daccedfc2.tar.gz portage-5df96179611ce0e98727945b1800b43daccedfc2.tar.bz2 portage-5df96179611ce0e98727945b1800b43daccedfc2.zip | |
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.
Diffstat (limited to 'pym/_emerge/BinpkgVerifier.py')
| -rw-r--r-- | pym/_emerge/BinpkgVerifier.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/_emerge/BinpkgVerifier.py b/pym/_emerge/BinpkgVerifier.py index 379c862af..91dc8a7d3 100644 --- a/pym/_emerge/BinpkgVerifier.py +++ b/pym/_emerge/BinpkgVerifier.py @@ -3,6 +3,7 @@ from _emerge.AsynchronousTask import AsynchronousTask from portage.util import writemsg +import io import sys import portage from portage import os @@ -27,7 +28,7 @@ class BinpkgVerifier(AsynchronousTask): stdout_orig = sys.stdout stderr_orig = sys.stderr global_havecolor = portage.output.havecolor - out = portage.StringIO() + out = io.StringIO() file_exists = True try: sys.stdout = out |