Fix p_key to catch exceptions from get_source_of_current_name

lohmataja · mlauter · commit 75e8e3593dd0 · 2014-09-24T15:19:32.000-04:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -968,14 +968,16 @@ def p_key(self, key):
             return ''
 
         elif key in key_dispatch[config.show_source_key]:
-            source = self.get_source_of_current_name()
-            if source is not None:
+            try:
+                source = self.get_source_of_current_name()
                 if config.highlight_show_source:
                     source = format(PythonLexer().get_tokens(source),
                                     TerminalFormatter())
                 page(source)
-            else:
-                self.statusbar.message(_('Cannot show source.'))
+            except (ValueError, NameError), e:
+                self.statusbar.message(_(e))
+            except (AttributeError, IOError, TypeError), e:
+                self.statusbar.message(_('Failed to get source: %s' % e))
             return ''
 
         elif key in ('\n', '\r', 'PADENTER'):
