[pypy-commit] pypy default: Argh

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r54553:d65a34cca537
Date: 2012-04-19 19:47 +0200
http://bitbucket.org/pypy/pypy/changeset/d65a34cca537/

Log:	Argh

diff --git a/pypy/annotation/description.py b/pypy/annotation/description.py
--- a/pypy/annotation/description.py
+++ b/pypy/annotation/description.py
@@ -229,8 +229,8 @@
                     return thing
                 elif hasattr(thing, '__name__'): # mostly types and functions
                     return thing.__name__
-                elif hasattr(thing, 'name'): # mostly ClassDescs
-                    return thing.name
+                elif hasattr(thing, 'name') and isinstance(thing.name, str):
+                    return thing.name            # mostly ClassDescs
                 elif isinstance(thing, tuple):
                     return '_'.join(map(nameof, thing))
                 else: