Merged from trunk -r14315:14316
authorFabian Groffen <grobian@gentoo.org>
Mon, 21 Sep 2009 17:48:54 +0000 (17:48 -0000)
committerFabian Groffen <grobian@gentoo.org>
Mon, 21 Sep 2009 17:48:54 +0000 (17:48 -0000)
commit2d41359a84076f064209cb725af8826caa05c5c2
treeacee33c3d1c367c1d469985acf068c7864e02b18
parent676d8ba340efcc869d6fd5887cb5a62068a06de9
   Merged from trunk -r14315:14316

   | 14316    | Define basestring as str when Python 3 is used.             |
   | arfrever |                                                             |

svn path=/main/branches/prefix/; revision=14348
21 files changed:
bin/repoman
pym/_emerge/BlockerCache.py
pym/_emerge/JobStatusDisplay.py
pym/_emerge/Package.py
pym/_emerge/Scheduler.py
pym/_emerge/depgraph.py
pym/_emerge/format_size.py
pym/portage/__init__.py
pym/portage/cache/metadata.py
pym/portage/cache/sqlite.py
pym/portage/cache/template.py
pym/portage/dbapi/bintree.py
pym/portage/dbapi/vartree.py
pym/portage/dep.py
pym/portage/elog/mod_echo.py
pym/portage/exception.py
pym/portage/locks.py
pym/portage/mail.py
pym/portage/process.py
pym/portage/proxy/lazyimport.py
pym/portage/sets/base.py