simplify error message raising and handling

mlauter · mlauter · commit 73d74b246335 · 2014-09-24T17:15:50.000-04:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -974,12 +974,10 @@ def p_key(self, key):
                     source = format(PythonLexer().get_tokens(source),
                                     TerminalFormatter())
                 page(source)
-            except (ValueError), e:
+            except (ValueError, AttributeError, IOError, TypeError), e:
                 self.statusbar.message(_(e))
             except (NameError), e:
                 self.statusbar.message(_('Cannot get source: %s' % e))
-            except (AttributeError, IOError, TypeError), e:
-                self.pager.message(_('Failed to get source: %s' % e))
             return ''
 
         elif key in ('\n', '\r', 'PADENTER'):
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -1306,13 +1306,11 @@ def show_source(self):
                 source = format(PythonLexer().get_tokens(source),
                                 TerminalFormatter())
             self.pager(source)
-        except (ValueError), e:
+        except (ValueError, AttributeError, IOError, TypeError), e:
             self.status_bar.message(_(e))
         except (NameError), e:
             self.status_bar.message(_('Cannot get source: %s' % e))
-        except (AttributeError, IOError, TypeError), e:
-            self.pager(_('Failed to 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
@@ -598,14 +598,12 @@ def get_source_of_current_name(self):
             	raise ValueError("Cannot get source of an empty string")
             if inspection.is_eval_safe_name(line):
                 obj = self.get_object(line)
-            if obj is None:
-                raise NameError("%s is not defined" % line)
+                
         try: 
             inspect.getsource(obj)
         except TypeError, e:
-            msg = e.msg
+            msg = e.message
             if "built-in" in msg:
-                msg.split(">")
                 raise TypeError("Cannot access source of <built-in function %s>" % self.current_line)
             else:
                 raise TypeError("No source code found for %s" % self.current_line)
