diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-02-19 05:29:48 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-02-19 05:29:48 +0000 |
| commit | 8ad412e223f255f7fa473028b49ac7b01cdbe008 (patch) | |
| tree | f27de2d6671f2683f476ae0f26fd70d27102f371 /pym/_emerge/__init__.py | |
| parent | Fix classes that implement __iter__() to copy it to their keys() method (diff) | |
| download | portage-multirepo-8ad412e223f255f7fa473028b49ac7b01cdbe008.tar.gz portage-multirepo-8ad412e223f255f7fa473028b49ac7b01cdbe008.tar.bz2 portage-multirepo-8ad412e223f255f7fa473028b49ac7b01cdbe008.zip | |
For compatibility with python-3.0, use isinstance() instead of type().
svn path=/main/trunk/; revision=12633
Diffstat (limited to 'pym/_emerge/__init__.py')
| -rw-r--r-- | pym/_emerge/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 00ef6f70..0200ce30 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -32,7 +32,7 @@ from portage import digraph from portage.const import NEWS_LIB_PATH import _emerge.help -import portage.xpak, commands, errno, re, socket, time, types +import portage.xpak, commands, errno, re, socket, time from portage.output import blue, bold, colorize, darkblue, darkgreen, darkred, green, \ nc_len, red, teal, turquoise, xtermTitle, \ xtermTitleReset, yellow @@ -277,8 +277,8 @@ def countdown(secs=5, doing="Starting"): # formats a size given in bytes nicely def format_size(mysize): - if type(mysize) not in [types.IntType,types.LongType]: - return str(mysize) + if isinstance(mysize, basestring): + return mysize if 0 != mysize % 1024: # Always round up to the next kB so that it doesn't show 0 kB when # some small file still needs to be fetched. |