On Sat, Dec 19, 2009 at 12:02 PM, Edward K. Ream <edream...@gmail.com> wrote: > > On Dec 19, 10:04 am, "Edward K. Ream" <edream...@gmail.com> wrote: >> I'd like to merge the leo-3k branch into the trunk today. Please hold >> commits to the trunk until further notice. > > Rev 2519 of the trunk now contains the merged leo-3k branch. > > All important unit tests pass, but this is just the *start* of the > wider testing of the code. Please report any problem with the trunk > immediately, no matter how large or small.
========================================================= kten...@nalbert2:~/work/download/leo-editor$ bzr revno 2521 kten...@nalbert2:~/work/download/leo-editor$ cd - /home/ktenney/work/explanans kten...@nalbert2:~/work/explanans$ leo /usr/bin/python ~/work/download/leo-editor/launchLeo.py start.leo *** isPython3: False Leo 4.7 devel, build 2277, August 28, 2009 Python 2.6.4, qt version 4.5.2 linux2 reading settings in /home/ktenney/work/download/leo-editor/leo/config/leoSettings.leo using menus from: leoSettings.leo reading settings in /home/ktenney/work/explanans/myLeoSettings.leo reading settings in /home/ktenney/work/explanans/start.leo reading /home/ktenney/.leo/.leoRecentFiles.txt Can not import Tkinter from plugin leo.plugins.plugins_menu Warning: plugin 'leo.plugins.plugins_menu' failed to import 'Tkinter' loadOnePlugin no init() at_folder loadOnePlugin no init() bookmarks Can not import Tkinter from plugin plugins_menu Warning: plugin 'plugins_menu' failed to import 'Tkinter' @enabled-plugins found in myLeoSettings.leo Traceback (most recent call last): File "/home/ktenney/work/download/leo-editor/launchLeo.py", line 8, in <module> leo.core.runLeo.run() File "/home/ktenney/work/download/leo-editor/leo/core/runLeo.py", line 95, in run ok = doPostPluginsInit(args,fn,relFn,script,versionFlag) File "/home/ktenney/work/download/leo-editor/leo/core/runLeo.py", line 363, in doPostPluginsInit c,frame = createFrame(fileName,relativeFileName,script) File "/home/ktenney/work/download/leo-editor/leo/core/runLeo.py", line 391, in createFrame ok, frame = g.openWithFileName(relativeFileName or fileName,None) File "/home/ktenney/work/download/leo-editor/leo/core/leoGlobals.py", line 2798, in openWithFileName ok = g.handleOpenHooks(c,old_c,gui,fn,f,readAtFileNodesFlag) File "/home/ktenney/work/download/leo-editor/leo/core/leoGlobals.py", line 2861, in handleOpenHooks readAtFileNodesFlag=readAtFileNodesFlag) # closes file. File "/home/ktenney/work/download/leo-editor/leo/core/leoFileCommands.py", line 896, in open silent=silent) File "/home/ktenney/work/download/leo-editor/leo/core/leoFileCommands.py", line 790, in getLeoFile c.redraw() File "/home/ktenney/work/download/leo-editor/leo/core/leoCommands.py", line 6512, in redraw c.frame.tree.redraw(p) File "/home/ktenney/work/download/leo-editor/leo/plugins/baseNativeTree.py", line 170, in full_redraw self.drawTopTree(p) File "/home/ktenney/work/download/leo-editor/leo/plugins/baseNativeTree.py", line 256, in drawTopTree self.drawTree(p) File "/home/ktenney/work/download/leo-editor/leo/plugins/baseNativeTree.py", line 270, in drawTree item = self.drawNode(p,parent_item) File "/home/ktenney/work/download/leo-editor/leo/plugins/baseNativeTree.py", line 222, in drawNode item = self.createTreeItem(p,parent_item) File "/home/ktenney/work/download/leo-editor/leo/plugins/qtGui.py", line 6207, in createTreeItem g.visit_tree_item(self.c, p, item) File "/home/ktenney/work/download/leo-editor/leo/core/leoPlugins.py", line 723, in __call__ except TryNext(exc): NameError: global name 'exc' is not defined kten...@nalbert2:~/work/explanans$ =============================================================== Thanks, Kent > > Please continue to refrain from commits to the trunk for a day or two. > This will allow us to back out of this commit easily should it be > necessary. > > Edward > > -- > > You received this message because you are subscribed to the Google Groups > "leo-editor" group. > To post to this group, send email to leo-edi...@googlegroups.com. > To unsubscribe from this group, send email to > leo-editor+unsubscr...@googlegroups.com. > For more options, visit this group at > http://groups.google.com/group/leo-editor?hl=en. > > > -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To post to this group, send email to leo-edi...@googlegroups.com. To unsubscribe from this group, send email to leo-editor+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/leo-editor?hl=en.