diff options
| author | kumar <kumar.mcmillan@gmail.com> | 2011-08-02 15:22:08 -0500 |
|---|---|---|
| committer | kumar <kumar.mcmillan@gmail.com> | 2011-08-02 15:22:08 -0500 |
| commit | 2a9857a3de2f7a93a7c4d97b6b2134bfadca4176 (patch) | |
| tree | f5d0c2a06c9c6786ace01b3001cceceab911ec1b /nose | |
| parent | f2c1ed09b74e1949e40cea35cccfc7c8eebcfb66 (diff) | |
| download | nose-2a9857a3de2f7a93a7c4d97b6b2134bfadca4176.tar.gz | |
Apparently messages can be ints? This prevents Unicode decode (Issue 442)
Diffstat (limited to 'nose')
| -rw-r--r-- | nose/__init__.py | 2 | ||||
| -rw-r--r-- | nose/plugins/capture.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nose/__init__.py b/nose/__init__.py index 1ebf76d..f713e4f 100644 --- a/nose/__init__.py +++ b/nose/__init__.py @@ -4,7 +4,7 @@ from nose.exc import SkipTest, DeprecatedTest from nose.tools import with_setup __author__ = 'Jason Pellerin' -__versioninfo__ = (1, 1, 2) +__versioninfo__ = (1, 1, 3) __version__ = '.'.join(map(str, __versioninfo__)) __all__ = [ diff --git a/nose/plugins/capture.py b/nose/plugins/capture.py index 911215d..cabd633 100644 --- a/nose/plugins/capture.py +++ b/nose/plugins/capture.py @@ -97,7 +97,8 @@ class Capture(Plugin): msg = len(ev.args) and ev.args[0] or '' else: msg = ev.message - if not isinstance(msg, unicode): + if (isinstance(msg, basestring) and + not isinstance(msg, unicode)): msg = msg.decode('utf8', 'replace') ev = u'%s: %s' % (ev.__class__.__name__, msg) if not isinstance(output, unicode): |