showing source in bpython-curtsies

thomasballinger · thomasballinger · commit f208cba275cf · 2014-07-11T14:08:37.000-04:00
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -366,10 +366,10 @@ def process_event(self, e):
             self.request_paint_to_clear_screen = True
         elif e in key_dispatch[self.config.last_output_key]: #TODO Not Implemented
             pass
-        elif e in ('\x1f',) + key_dispatch[self.config.show_source_key]: #TODO Not Implemented
+        elif e in ('\x1f',) + key_dispatch[self.config.show_source_key]:
             source = self.get_source_of_current_name()
             if source is None:
-                self.status_bar.message('whoops!')
+                self.status_bar.message(_('Cannot show source.'))
             else:
                 if self.config.highlight_show_source:
                     source = format(PythonLexer().get_tokens(source), TerminalFormatter())
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -577,10 +577,13 @@ def get_source_of_current_name(self):
         source cannot be found."""
         try:
             obj = self.current_func
+            logging.debug('current func is %r', obj)
             if obj is None:
                 line = self.current_line
                 if inspection.is_eval_safe_name(line):
                     obj = self.get_object(line)
+                if obj is None:
+                    return None
             source = inspect.getsource(obj)
         except (AttributeError, IOError, NameError, TypeError):
             return None
