Merge branch 'clear-modules-and-reevaluate'

thomasballinger · thomasballinger · commit 975b381b2ae1 · 2014-07-27T13:33:38.000-04:00
Conflicts:
	bpython/curtsiesfrontend/repl.py
diff --git a/bpython/config.py b/bpython/config.py
@@ -80,6 +80,7 @@ def loadini(struct, configfile):
             'show_source': 'F2',
             'suspend': 'C-z',
             'undo': 'C-r',
+            'reimport': 'F6',
             'search': 'C-o',
             'up_one_line': 'C-p',
             'yank_from_buffer': 'C-y'},
@@ -120,6 +121,7 @@ def loadini(struct, configfile):
     struct.show_source_key = config.get('keyboard', 'show_source')
     struct.suspend_key = config.get('keyboard', 'suspend')
     struct.undo_key = config.get('keyboard', 'undo')
+    struct.reimport_key = config.get('keyboard', 'reimport')
     struct.up_one_line_key = config.get('keyboard', 'up_one_line')
     struct.down_one_line_key = config.get('keyboard', 'down_one_line')
     struct.cut_to_buffer_key = config.get('keyboard', 'cut_to_buffer')
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -248,6 +248,8 @@ def smarter_request_refresh():
         self.current_match = None
         self.list_win_visible = False
 
+        self.original_modules = sys.modules.keys()
+
         self.width = None  # will both be set by a window resize event
         self.height = None
 
@@ -408,6 +410,9 @@ def process_event(self, e):
         elif e in ("<Shift-TAB>",):
             self.on_tab(back=True)
             self.rl_history.reset()
+        elif e in key_dispatch[self.config.reimport_key]:
+            self.clear_modules_and_reevaluate()
+            self.update_completion()
         elif e in key_dispatch[self.config.undo_key]: #ctrl-r for undo
             self.undo()
             self.update_completion()
@@ -516,6 +521,14 @@ def send_session_to_external_editor(self, filename=None):
         self.current_line = lines[-1][4:]
         self.cursor_offset = len(self.current_line)
 
+    def clear_modules_and_reevaluate(self):
+        cursor, line = self.cursor_offset, self.current_line
+        for modname in sys.modules.keys():
+            if modname not in self.original_modules:
+                del sys.modules[modname]
+        self.reevaluate(insert_into_history=True)
+        self.cursor_offset, self.current_line = cursor, line
+
     ## Handler Helpers
     def add_normal_character(self, char):
         if len(char) > 1 or is_nop(char):
diff --git a/doc/sphinx/source/configuration-options.rst b/doc/sphinx/source/configuration-options.rst
@@ -167,6 +167,14 @@ Default: F9
 
 Shows the last output in the systems $PAGER.
 
+reimport
+^^^^^^^^
+Default: F6
+
+Reruns entire session, reloading all modules by clearing the sys.modules cache.
+
+.. versionadded:: 0.14
+
 save
 ^^^^
 Default: C-s
