diff options
| -rw-r--r-- | debug_toolbar/panels/signals.py | 2 | ||||
| -rw-r--r-- | debug_toolbar/panels/template.py | 2 | ||||
| -rw-r--r-- | debug_toolbar/utils/__init__.py | 5 | ||||
| -rw-r--r-- | setup.py | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/debug_toolbar/panels/signals.py b/debug_toolbar/panels/signals.py index 205b3c5..4beaf03 100644 --- a/debug_toolbar/panels/signals.py +++ b/debug_toolbar/panels/signals.py @@ -73,7 +73,7 @@ class SignalDebugPanel(DebugPanel): if receiver is None: continue if getattr(receiver, 'im_self', None) is not None: - text = "method %s on %s object" % (receiver.__name__, receiver.im_self.__class__.__name__) + text = "method %s on %s object" % (receiver.__name__, getattr(receiver.im_self, '__class__', type).__name__) elif getattr(receiver, 'im_class', None) is not None: text = "method %s on %s" % (receiver.__name__, receiver.im_class.__name__) else: diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py index e5be91e..a69b42a 100644 --- a/debug_toolbar/panels/template.py +++ b/debug_toolbar/panels/template.py @@ -83,6 +83,8 @@ class TemplateDebugPanel(DebugPanel): pformat(value) # this MAY trigger a db query except SQLQueryTriggered: temp_layer[key] = '<<triggers database query>>' + except UnicodeEncodeError: + temp_layer[key] = '<<unicode encode error>>' else: temp_layer[key] = value finally: diff --git a/debug_toolbar/utils/__init__.py b/debug_toolbar/utils/__init__.py index 0a78dac..45dfc6f 100644 --- a/debug_toolbar/utils/__init__.py +++ b/debug_toolbar/utils/__init__.py @@ -129,7 +129,10 @@ def getframeinfo(frame, context=1): else: lines = index = None - return inspect.Traceback(filename, lineno, frame.f_code.co_name, lines, index) + if hasattr(inspect, 'Traceback'): + return inspect.Traceback(filename, lineno, frame.f_code.co_name, lines, index) + else: + return (filename, lineno, frame.f_code.co_name, lines, index) def get_stack(context=1): """ @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name='django-debug-toolbar', - version='0.9.0-dev', + version='0.9.1', description='A configurable set of panels that display various debug information about the current request/response.', long_description=open('README.rst').read(), # Get more strings from http://www.python.org/pypi?:action=list_classifiers |