Use a specific SourceNotFound in get_source_of_current_name().

Trundle · Trundle · commit e18e43787bfe · 2014-10-12T20:06:40.000+02:00
Instead of leaking all possible exceptions (that the caller has to deal
with), use a single `SourceNotFound` exception.
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -969,14 +969,13 @@ def p_key(self, key):
         elif key in key_dispatch[config.show_source_key]:
             try:
                 source = self.get_source_of_current_name()
+            except repl.SourceNotFound, e:
+                self.statusbar.message(_(e))
+            else:
                 if config.highlight_show_source:
                     source = format(PythonLexer().get_tokens(source),
                                     TerminalFormatter())
                 page(source)
-            except (ValueError, AttributeError, IOError, TypeError), e:
-                self.statusbar.message(_(e))
-            except NameError, e:
-                self.statusbar.message(_('Cannot get source: %s' % e))
             return ''
 
         elif key in ('\n', '\r', 'PADENTER'):
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -29,7 +29,7 @@
 from curtsies import events
 
 import bpython
-from bpython.repl import Repl as BpythonRepl
+from bpython.repl import Repl as BpythonRepl, SourceNotFound
 from bpython.config import Struct, loadini, default_config_path
 from bpython.formatter import BPythonFormatter
 from bpython import autocomplete, importcompletion
@@ -1302,14 +1302,13 @@ def pager(self, text):
     def show_source(self):
         try:
             source = self.get_source_of_current_name()
+        except SourceNotFound, e:
+            self.status_bar.message(_(e))
+        else:
             if self.config.highlight_show_source:
                 source = format(PythonLexer().get_tokens(source),
                                 TerminalFormatter())
             self.pager(source)
-        except (ValueError, AttributeError, IOError, TypeError), e:
-            self.status_bar.message(_(e))
-        except NameError, e:
-            self.status_bar.message(_('Cannot get source: %s' % e))
 
     def help_text(self):
         return (self.version_help_text() + '\n' + self.key_help_text()).encode('utf8')
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -377,6 +377,10 @@ def file_prompt(self, s):
         raise NotImplementedError
 
 
+class SourceNotFound(Exception):
+    """Exception raised when the requested source could not be found."""
+
+
 class Repl(object):
     """Implements the necessary guff for a Python-repl-alike interface
 
@@ -587,23 +591,27 @@ def get_args(self):
 
     def get_source_of_current_name(self):
         """Return the source code of the object which is bound to the
-        current name in the current input line. Throw exception if the
+        current name in the current input line. Throw `SourceNotFound` if the
         source cannot be found."""
         obj = self.current_func
-        if obj is None:
-            line = self.current_line
-            if line == "":
-            	raise ValueError("Nothing to get source of")
-            if inspection.is_eval_safe_name(line):
-                obj = self.get_object(line)
         try:
-            return inspect.getsource(obj)
+            if obj is None:
+                line = self.current_line
+                if not line.strip():
+                    raise SourceNotFound("Nothing to get source of")
+                if inspection.is_eval_safe_name(line):
+                    obj = self.get_object(line)
+                return inspect.getsource(obj)
+        except (AttributeError, NameError), e:
+            msg = "Cannot get source: " + str(e)
+        except IOError, e:
+            msg = str(e)
         except TypeError, e:
-            msg = e.message
-            if "built-in" in msg:
-                raise TypeError("Cannot access source of <built-in function %s>" % self.current_line)
+            if "built-in" in str(e):
+                msg = "Cannot access source of %r" % (obj, )
             else:
-                raise TypeError("No source code found for %s" % self.current_line)
+                msg = "No source code found for %s" % (self.current_line, )
+        raise SourceNotFound(msg)
 
     def set_docstring(self):
         self.docstring = None
