# HG changeset patch
# User catherine.devlin@gmail.com
# Date 1212521214 14400
# Node ID 34fb410954518a3a79d2ef31ce3385f96a247a80
# Parent  927bc07467deea0fbeefc4acd718b42d616648a9
avoiding do_load overload

diff -r 927bc07467de -r 34fb41095451 cmd2.py
--- a/cmd2.py	Tue Jun 03 15:04:40 2008 -0400
+++ b/cmd2.py	Tue Jun 03 15:26:54 2008 -0400
@@ -490,7 +490,7 @@
             f.close()        
                 
         os.system('%s %s' % (self.editor, filename))
-        self.do_load(filename)
+        self.do__load(filename)
     do_edit = do_ed
     
     def do_save(self, fname=None):
@@ -528,7 +528,8 @@
         self.stdin.close()
         keepstate.restore()
         self.lastcmd = ''
-        return (stop == self._STOP_AND_EXIT) and self._STOP_AND_EXIT
+        return (stop == self._STOP_AND_EXIT) and self._STOP_AND_EXIT    
+    do__load = do_load  # avoid an unfortunate legacy use of do_load from sqlpython
     
     def do_run(self, arg):
         """run [arg]: re-runs an earlier command