From fd31ecc0bf3c39cb572ced91afb853adfa84f8f0 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 26 Oct 2009 11:19:44 -0400 Subject: [PATCH 1/2] Minor problem with rogue merge info in HHC.py. --- pyfpdb/HandHistoryConverter.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py index 7e10e66a..0642d845 100644 --- a/pyfpdb/HandHistoryConverter.py +++ b/pyfpdb/HandHistoryConverter.py @@ -1,8 +1,5 @@ #!/usr/bin/python -<<<<<<< HEAD:pyfpdb/HandHistoryConverter.py # -*- coding: utf-8 -*- -======= ->>>>>>> 1efdd7fc68d3c9ce013f4d42730bece8075e2272:pyfpdb/HandHistoryConverter.py #Copyright 2008 Carl Gherardi #This program is free software: you can redistribute it and/or modify From 0ac559a2db1f6475f4d0414b1d524dd323d1d3be Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 26 Oct 2009 16:50:17 -0400 Subject: [PATCH 2/2] Add a comment to a comment. --- pyfpdb/HUD_main.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py index 021d1ff2..a0f152b7 100755 --- a/pyfpdb/HUD_main.py +++ b/pyfpdb/HUD_main.py @@ -128,6 +128,9 @@ class HUD_main(object): gtk.gdk.threads_enter() try: # TODO: seriously need to decrease the scope of this block.. what are we expecting to error? + # TODO: The purpose of this try/finally block is to make darn sure that threads_leave() + # TODO: gets called. If there is an exception and threads_leave() doesn't get called we + # TODO: lock up. REB newlabel = gtk.Label("%s - %s" % (table.site, table_name)) self.vb.add(newlabel) newlabel.show()