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/portage/dbapi/vartree.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/portage/dbapi/vartree.py')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index d5c055420..bec3d6629 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -2925,7 +2925,7 @@ class dblink(object): log_path = None if self.settings.get("PORTAGE_BACKGROUND") != "subprocess": log_path = self.settings.get("PORTAGE_LOG_FILE") - out = portage.StringIO() + out = io.StringIO() for line in lines: func(line, phase=phase, key=self.mycpv, out=out) msg = out.getvalue() |