Removed redundant history.save() calls in gtk_.py, cli.py and urwid.py.

amjith · amjith · commit 9069471e254d · 2011-04-27T21:57:00.000-06:00
Fixed the bug that caused every command entered in the gtk interface to be
appended twice to the history.
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1716,9 +1716,6 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
         clirepl.write(banner)
         clirepl.write('\n')
     clirepl.repl()
-    if config.hist_length:
-        histfilename = os.path.expanduser(config.hist_file)
-        clirepl.rl_history.save(histfilename, getpreferredencoding())
 
     main_win.erase()
     main_win.refresh()
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -688,7 +688,6 @@ def push_line(self):
         # Save mark for easy referencing later
         self.text_buffer.create_mark('line%i_start' % (len(self.buffer), ),
                                      self.get_line_start_iter(), True)
-        self.rl_history.append(line)
         iter_ = self.get_line_end_iter()
         self.text_buffer.place_cursor(iter_)
         with self.editing:
@@ -859,10 +858,7 @@ def main(args=None):
         gtk.main()
     except KeyboardInterrupt:
         pass
-    finally:
-        if config.hist_length:
-            histfilename = os.path.expanduser(config.hist_file)
-            repl_widget.rl_history.save(histfilename, getpreferredencoding())
+
     return 0
 
 if __name__ == '__main__':
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -745,11 +745,12 @@ def push(self, s, insert_into_history=True):
         s = s.rstrip('\n')
         self.buffer.append(s)
 
-        histfilename = os.path.expanduser(self.config.hist_file)
 
         if insert_into_history:
             self.rl_history.append(s)
-            self.rl_history.save(histfilename, getpreferredencoding())
+            if self.config.hist_length:
+                histfilename = os.path.expanduser(self.config.hist_file)
+                self.rl_history.save(histfilename, getpreferredencoding())
 
         more = self.interp.runsource('\n'.join(self.buffer))
 
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -1019,11 +1019,6 @@ def run_with_screen_before_mainloop():
                     continue
                 break
 
-            if config.hist_length:
-                histfilename = os.path.expanduser(config.hist_file)
-                myrepl.rl_history.save(histfilename,
-                                       locale.getpreferredencoding())
-
         finally:
             sys.stdin = orig_stdin
             sys.stderr = orig_stderr
