Merge lp:~ara/mago/cleaner_happier into lp:~mago-contributors/mago/mago-1.0

[Ara Pulido]

Avoid the unnecessary try/catch blocks that are all over the application wrappers. The main reason of these blocks were to give a correct error message, when LDTP didn't give us one.

We are going to avoid these blocks, and, whenever LDTP gives a wrong (or not clear) error message, we are going to file a bug against LDTP instead. This will make Mago code cleaner, and we will be improving LDTP.

[James Tatum (jtatum)]

This is a neat change. I tried to make this one early on but for some reason got some resistance Do you think the LDTP exceptions are OK as is or could they stand to be improved to clearly identify the causes? On the other hand, having a backtrace gets you the exact line of the code that failed which is about as good as the rewritten exceptions did anyway...

review: Approve

[Ara Pulido (ara)]

Indeed, the LDTP exceptions can be improved a lot. This is why I want to change the strategy, and, every time I receive an LDTP exception that does not help me, I will file a bug against LDTP instead.

Thanks for the review, I will merge the changes now.

=== modified file 'mago/application/gcalc.py'
--- mago/application/gcalc.py	2010-10-15 11:46:53 +0000
+++ mago/application/gcalc.py	2010-10-20 10:26:00 +0000
@@ -97,14 +97,13 @@
         True
         """
         calculator = ooldtp.context(self.name)
-        try:
-            children = calculator.getchild(button,'push button')
-            for child in children:
-                childName=child.getName()
-                if calculator.hasstate(childName, ldtp.state.SHOWING):
-                    return True
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error locating button %s" % button
+
+        children = calculator.getchild(button,'push button')
+        for child in children:
+            childName=child.getName()
+            if calculator.hasstate(childName, ldtp.state.SHOWING):
+                return True
+        
         return False
     
     def push(self, buttons):
@@ -120,12 +119,9 @@
         """
         calculator = ooldtp.context(self.name)
         for button in buttons:
-            try:
-                children = calculator.getchild(self.BUTTONS[button],'push button')
-                for child in children:
-                    child.click()
-            except ldtp.LdtpExecutionError:
-                raise ldtp.LdtpExecutionError, "Error clicking button %s" % button
+            children = calculator.getchild(self.BUTTONS[button],'push button')
+            for child in children:
+                child.click()
     
     def get_view(self):
         """
@@ -161,15 +157,10 @@
         new_window_name = self.VIEWS[new_view]["WINDOW"]
         new_view_menu_name = self.VIEWS[new_view]["MENU"]
         calculator = ooldtp.context(self.name)
-        try:
-            mnu_new_view = calculator.getchild(new_view_menu_name)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The menu item for the requested view was not found."
+        mnu_new_view = calculator.getchild(new_view_menu_name)
 
-        try:
-            mnu_new_view.selectmenuitem() 
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "There was a problem changing views."
+        mnu_new_view.selectmenuitem() 
+        
         self.set_name(new_window_name)
         calculator.remap()
         time.sleep(self.SLEEP_DELAY) # need to give mago some time to catch up to calc ui
@@ -188,11 +179,8 @@
         @rtype: string
         """
         calculator = ooldtp.context(self.name)
-        try:
-            editBar = calculator.getchild(role=self.EDITBAR_ROLE)
-            value = editBar[0].gettextvalue()
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "There was a problem reading the value."
+        editBar = calculator.getchild(role=self.EDITBAR_ROLE)
+        value = editBar[0].gettextvalue()
         return value
 
     def set_thousands_separator(self, option = True):

=== modified file 'mago/application/gedit.py'
--- mago/application/gedit.py	2010-07-22 10:43:18 +0000
+++ mago/application/gedit.py	2010-10-20 10:26:00 +0000
@@ -66,30 +66,16 @@
         Application.save(self, self.MNU_SAVE)
         ooldtp.context(self.name)
 
-        try:
-            ldtp.waittillguiexist(self.SAVE_DLG)
-            save_dialog = ooldtp.context(self.SAVE_DLG)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The Gedit save dialog was not found."
-        try:
-            save_dlg_txt_filename = save_dialog.getchild(self.SAVE_DLG_TXT_NAME)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The filename txt field in Gedit save dialog was not found."
-        try:
-            ldtp.wait(2)
-            save_dlg_txt_filename.settextvalue(filename)
-        except ldtp.LdtpExecutionError:
-           raise ldtp.LdtpExecutionError, "We couldn't write text."
+        ldtp.waittillguiexist(self.SAVE_DLG)
+        save_dialog = ooldtp.context(self.SAVE_DLG)
+        
+        save_dlg_txt_filename = save_dialog.getchild(self.SAVE_DLG_TXT_NAME)
+        ldtp.wait(2)
+        save_dlg_txt_filename.settextvalue(filename)
 
-        try:
-            save_dlg_btn_save = save_dialog.getchild(self.SAVE_DLG_BTN_SAVE)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The button Save in Gedit save dialog was not found."
+        save_dlg_btn_save = save_dialog.getchild(self.SAVE_DLG_BTN_SAVE)
         
-        try:
-            save_dlg_btn_save.click()
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "There was an error when pushing the Save button."
+        save_dlg_btn_save.click()
 
         ldtp.waittillguinotexist(self.SAVE_DLG)
         ldtp.wait(1)
@@ -107,15 +93,9 @@
         """
 
         # Exit using the Quit menu 
-        try:
-            gedit = ooldtp.context(self.name)
-            try:
-                quit_menu = gedit.getchild(self.MNU_QUIT)
-            except ldtp.LdtpExecutionError:
-                raise ldtp.LdtpExecutionError, "The quit menu was not found."
-            quit_menu.selectmenuitem()
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Mmm, something went wrong when closing the application."
+        gedit = ooldtp.context(self.name)
+        quit_menu = gedit.getchild(self.MNU_QUIT)
+        quit_menu.selectmenuitem()
 
         question_dialog = None
         count = 0
@@ -137,45 +117,24 @@
                     question_dlg_btn_save.click()
                 except ldtp.LdtpExecutionError:
                     # If the Save button was not found, we will try to find the Save As
-                    try:
-                        question_dlg_btn_save = question_dialog.getchild(self.QUESTION_DLG_BTN_SAVE_AS)
-                        question_dlg_btn_save.click()
-                    except ldtp.LdtpExecutionError:
-                        raise ldtp.LdtpExecutionError, "The save or save as buttons in Gedit question dialog were not found."
-
-                    try:
-                        ldtp.waittillguiexist(self.SAVE_DLG)
-                        save_dialog = ooldtp.context(self.SAVE_DLG)
-                    except ldtp.LdtpExecutionError:
-                        raise ldtp.LdtpExecutionError, "The Gedit save dialog was not found."
-                    try:
-                        save_dlg_txt_filename = save_dialog.getchild(self.SAVE_DLG_TXT_NAME)
-                    except ldtp.LdtpExecutionError:
-                        raise ldtp.LdtpExecutionError, "The filename txt field in Gedit save dialog was not found."
-                    try:
-                        ldtp.wait(2)
-                        save_dlg_txt_filename.settextvalue(filename)
-                    except ldtp.LdtpExecutionError:
-                        raise ldtp.LdtpExecutionError, "There was an error when writing the text."
-
-                    try:
-                        save_dlg_btn_save = save_dialog.getchild(self.SAVE_DLG_BTN_SAVE)
-                    except ldtp.LdtpExecutionError:
-                        raise ldtp.LdtpExecutionError, "The save button in Gedit save dialog was not found."
-        
-                    try:
-                        save_dlg_btn_save.click()
-                    except ldtp.LdtpExecutionError:
-                        raise ldtp.LdtpExecutionError, "There was an error when pushing the Save button."
+                    question_dlg_btn_save = question_dialog.getchild(self.QUESTION_DLG_BTN_SAVE_AS)
+                    question_dlg_btn_save.click()
+
+                    ldtp.waittillguiexist(self.SAVE_DLG)
+                    save_dialog = ooldtp.context(self.SAVE_DLG)
+                    
+                    save_dlg_txt_filename = save_dialog.getchild(self.SAVE_DLG_TXT_NAME)
+                    ldtp.wait(2)
+                    save_dlg_txt_filename.settextvalue(filename)
+
+                    save_dlg_btn_save = save_dialog.getchild(self.SAVE_DLG_BTN_SAVE)
+                    save_dlg_btn_save.click()
 
                     ldtp.waittillguinotexist(self.SAVE_DLG)
             
             else:
-                try:
-                    question_dlg_btn_close = question_dialog.getchild(self.QUESTION_DLG_BTN_CLOSE)
-                    question_dlg_btn_close.click()
-                except ldtp.LdtpExecutionError:
-                    raise ldtp.LdtpExecutionError, "It was not possible to click the close button."
+                question_dlg_btn_close = question_dialog.getchild(self.QUESTION_DLG_BTN_CLOSE)
+                question_dlg_btn_close.click()
 
             gedit.waittillguinotexist(guiTimeOut=20)
 

=== modified file 'mago/application/gnome_screenshot.py'
--- mago/application/gnome_screenshot.py	2010-07-22 10:43:18 +0000
+++ mago/application/gnome_screenshot.py	2010-10-20 10:26:00 +0000
@@ -60,45 +60,18 @@
         @param delay: The number of seconds to delay before taking the 
                       screenshot.
         """
-        try:
-            gnome_screenshot = ooldtp.context(self.name)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error finding " + name
-
-        try:
-            radio_button = gnome_screenshot.getchild(self.GRAB_THE_WHOLE_DESKTOP_RADIO)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error finding " + self.GRAB_THE_WHOLE_DESKTOP_RADIO
-
-        try:
-            radio_button.click()
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error clicking on radio button."
-
-        try:
-            delay_field = gnome_screenshot.getchild(self.GRAB_AFTER_DELAY_FIELD)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error finding " + self.GRAB_AFTER_DELAY_FIELD
-
-        try:        
-            delay_field.setvalue(delay)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error setting value to " + self.GRAB_AFTER_DELAY_FIELD
-
-        try:
-            save_button = gnome_screenshot.getchild(self.TAKE_SCREENSHOT_BUTTON)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error finding " + self.TAKE_SCREENSHOT_BUTTON
-
-        try:
-            ldtp.click(self.WINDOW, self.TAKE_SCREENSHOT_BUTTON)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error clicking on save button"
-
-        try:
-            ldtp.waittillguinotexist(self.WINDOW)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Window " + self.WINDOW + " did not go away."
+        gnome_screenshot = ooldtp.context(self.name)
+
+        radio_button = gnome_screenshot.getchild(self.GRAB_THE_WHOLE_DESKTOP_RADIO)
+        radio_button.click()
+
+        delay_field = gnome_screenshot.getchild(self.GRAB_AFTER_DELAY_FIELD)
+        delay_field.setvalue(delay)
+
+        save_button = gnome_screenshot.getchild(self.TAKE_SCREENSHOT_BUTTON)
+        ldtp.click(self.WINDOW, self.TAKE_SCREENSHOT_BUTTON)
+
+        ldtp.waittillguinotexist(self.WINDOW)
 
 
     def take_current_window_screenshot(self, delay):
@@ -112,45 +85,18 @@
         @param delay: The number of seconds to delay before taking the 
                       screenshot.
         """
-        try:
-            gnome_screenshot = ooldtp.context(self.name)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error finding " + name
-
-        try:
-            radio_button = gnome_screenshot.getchild(self.GRAB_THE_CURRENT_WINDOW_RADIO)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error finding " + self.GRAB_THE_CURRENT_WINDOW_RADIO
-
-        try:
-            radio_button.click()
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error clicking on radio button"
+        gnome_screenshot = ooldtp.context(self.name)
+
+        radio_button = gnome_screenshot.getchild(self.GRAB_THE_CURRENT_WINDOW_RADIO)
+        radio_button.click()
     
-        try:
-            delay_field = gnome_screenshot.getchild(self.GRAB_AFTER_DELAY_FIELD)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error finding " + self.GRAB_AFTER_DELAY_FIELD
-
-        try:
-            delay_field.setvalue(delay)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error setting delay to " + delay
-
-        try:
-            save_button = gnome_screenshot.getchild(self.TAKE_SCREENSHOT_BUTTON)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error finding " + self.TAKE_SCREENSHOT_BUTTON
-
-        try:
-            save_button.click()
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error clicking on save button"
-
-        try:
-            ldtp.waittillguinotexist(self.WINDOW)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Window " + self.WINDOW + " did not go away"
+        delay_field = gnome_screenshot.getchild(self.GRAB_AFTER_DELAY_FIELD)
+        delay_field.setvalue(delay)
+
+        save_button = gnome_screenshot.getchild(self.TAKE_SCREENSHOT_BUTTON)
+        save_button.click()
+
+        ldtp.waittillguinotexist(self.WINDOW)
 
     def grab_selected_area(self, delay):
         """
@@ -163,45 +109,18 @@
         @param delay: The number of seconds to delay before taking the 
                       screenshot.
         """
-        try:
-            gnome_screenshot = ooldtp.context(self.name)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error finding " + name
-
-        try:
-            radio_button = gnome_screenshot.getchild(self.GRAB_A_SELECTED_AREA)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error finding " + self.GRAB_A_SELECTED_AREA
-
-        try:
-            radio_button.click()
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error clicking on radio button"
-
-        try:
-            delay_field = gnome_screenshot.getchild(self.GRAB_AFTER_DELAY_FIELD)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error finding " + self.GRAB_AFTER_DELAY_FIELD
-        
-        try:
-            delay_field.setvalue(delay)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error setting delay to " + delay
-
-        try:
-            save_button = gnome_screenshot.getchild(self.TAKE_SCREENSHOT_BUTTON)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error finding " + self.TAKE_SCREENSHOT_BUTTON
-
-        try:
-            save_button.click()
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error clicking on save button"
-
-        try:
-            ldtp.waittillguinotexist(self.WINDOW)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Window " + self.WINDOW + " did not go away"
+        gnome_screenshot = ooldtp.context(self.name)
+
+        radio_button = gnome_screenshot.getchild(self.GRAB_A_SELECTED_AREA)
+        radio_button.click()
+
+        delay_field = gnome_screenshot.getchild(self.GRAB_AFTER_DELAY_FIELD)
+        delay_field.setvalue(delay)
+
+        save_button = gnome_screenshot.getchild(self.TAKE_SCREENSHOT_BUTTON)
+        save_button.click()
+
+        ldtp.waittillguinotexist(self.WINDOW)
 
         # Select the area of the screen for the screenshot.  As long as your screen is
         # larger than 200x200px this should work fine.
@@ -221,25 +140,11 @@
                          into the current users home folder.  You cannot
                          specify a directory.
         """
-        try:
-            ldtp.waittillguiexist(self.SAVE_FILE_WINDOW)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Window " + self.SAVE_FILE_WINDOW + " did not appear"
-
-        try:
-            save_file_window = ooldtp.context(self.SAVE_FILE_WINDOW)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error finding window " + self.SAVE_FILE_WINDOW
-
-        try:
-            filename_field = save_file_window.getchild(self.SAVE_FILE_NAME_TEXT)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error finding " + self.SAVE_FILE_NAME_TEXT
-
-        try:
-            filename_field.settextvalue(filename)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error setting filename to " + delay
+        ldtp.waittillguiexist(self.SAVE_FILE_WINDOW)
+
+        save_file_window = ooldtp.context(self.SAVE_FILE_WINDOW)
+        filename_field = save_file_window.getchild(self.SAVE_FILE_NAME_TEXT)
+        filename_field.settextvalue(filename)
 
         # There is a bug in gnome-screenshot that prevents the combobox 
         # name from being used.  There is only one combo box so its easy to 
@@ -247,22 +152,9 @@
         #
         # Also for some reason ooldtp didn't seem to be able select the combo
         # box properly.
-        try:
-            ldtp.comboselectindex(self.SAVE_FILE_WINDOW, "cbo#0", 0)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error setting folder to home folder"
-
-        try:
-            save_file_button = save_file_window.getchild(self.SAVE_FILE_BUTTON)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error finding " + self.SAVE_FILE_BUTTON
-
-        try:
-            save_file_button.click()
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error clicking on save button"
-
-        try:
-            ldtp.waittillguinotexist(self.SAVE_FILE_WINDOW)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Window " + self.SAVE_FILE_WINDOW + " did not go away"
+        ldtp.comboselectindex(self.SAVE_FILE_WINDOW, "cbo#0", 0)
+
+        save_file_button = save_file_window.getchild(self.SAVE_FILE_BUTTON)
+
+        save_file_button.click()
+        ldtp.waittillguinotexist(self.SAVE_FILE_WINDOW)

=== modified file 'mago/application/main.py'
--- mago/application/main.py	2010-09-10 09:16:21 +0000
+++ mago/application/main.py	2010-10-20 10:26:00 +0000
@@ -99,24 +99,19 @@
         """
         Given an application, it tries to close it.
         """
-        try:
-            app = ooldtp.context(self.name)
-            try:
-                close_widget = app.getchild(self.close_name)
-            except ldtp.LdtpExecutionError:
-                raise ldtp.LdtpExecutionError, "The " + self.close_name + " widget was not found."
+        app = ooldtp.context(self.name)
+        close_widget = app.getchild(self.close_name)
 
-            if self.close_type == 'menu':
-                close_widget.selectmenuitem()
-            elif self.close_type == 'button':
-                close_widget.click()
-            else:
-                raise ldtp.LdtpExecutionError, "Wrong close item type."
-            response = ldtp.waittillguinotexist(self.name, '', 20)
-            if response == 0:
-                raise ldtp.LdtpExecutionError, "Mmm, something went wrong when closing the application."
-        except ldtp.LdtpExecutionError, msg:
-            raise ldtp.LdtpExecutionError, "Mmm, something went wrong when closing the application: " + str(msg)
+        if self.close_type == 'menu':
+            close_widget.selectmenuitem()
+        elif self.close_type == 'button':
+            close_widget.click()
+        else:
+            raise ldtp.LdtpExecutionError, "Wrong close item type."
+        
+        response = ldtp.waittillguinotexist(self.name, '', 20)
+        if response == 0:
+            raise ldtp.LdtpExecutionError, "Mmm, something went wrong when closing the application."
 
     def save(self, save_menu=_('mnuSave')):
         """
@@ -126,16 +121,10 @@
         @type save_menu: string
         @param save_menu: The name of the Save menu of the application. If not mentioned the default will be used ("Save").
         """
-        try:
-            app = ooldtp.context(self.name)
-            try:
-                actualMenu = app.getchild(save_menu)
-            except ldtp.LdtpExecutionError:
-                raise ldtp.LdtpExecutionError, "The " + save_menu + " menu was not found."
+        app = ooldtp.context(self.name)
+        actualMenu = app.getchild(save_menu)
 
-            actualMenu.selectmenuitem()
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Mmm, something went wrong when saving the current document."
+        actualMenu.selectmenuitem()
 
     def write_text(self, text, txt_field=''):
         """
@@ -144,20 +133,11 @@
         app = ooldtp.context(self.name)
 
         if txt_field == '':
-            try:
-                ldtp.enterstring(text)
-            except ldtp.LdtpExecutionError:
-                raise ldtp.LdtpExecutionError, "We couldn't write text."
+            ldtp.enterstring(text)
         else:
-            try:
-                app_txt_fields = app.getchild(txt_field, "text")
-            except ldtp.LdtpExecutionError:
-                raise ldtp.LdtpExecutionError, "The " + txt_field + " text field was not found."
-            try:
-                for field in app_txt_fields:
-                    field.settextvalue(text)
-            except ldtp.LdtpExecutionError:
-                raise ldtp.LdtpExecutionError, "We couldn't write text."
+            app_txt_fields = app.getchild(txt_field, "text")
+            for field in app_txt_fields:
+                field.settextvalue(text)
 
     def _enable_a11y(self, enable):
         os.environ['NO_GAIL'] = str(int(not enable))

=== modified file 'mago/application/policykit.py'
--- mago/application/policykit.py	2010-07-22 10:43:18 +0000
+++ mago/application/policykit.py	2010-10-20 10:26:00 +0000
@@ -57,13 +57,9 @@
         
         ooldtp.context(self.name)
         
-        try:
-            ldtp.enterstring (self.password)
-            ldtp.enterstring ("<enter>")
+        ldtp.enterstring (self.password)
+        ldtp.enterstring ("<enter>")
             
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The PolicyKit txt field for the password was not found."
-   
 # TODO: Change this to use ooldtp
 #        try:
 #            btnOK = polKit.getchild(self.BTN_OK)
@@ -78,10 +74,7 @@
     def cancel(self):
         polKit = ooldtp.context(self.name)
 
-        try:
-            cancelButton = polKit.getchild(self.BTN_CANCEL)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The PolicyKit cancel button was not found."
-          
+        cancelButton = polKit.getchild(self.BTN_CANCEL)
         cancelButton.click()
+        
         ldtp.waittillguinotexist (self.name)

=== modified file 'mago/application/seahorse.py'
--- mago/application/seahorse.py	2010-07-22 10:43:18 +0000
+++ mago/application/seahorse.py	2010-10-20 10:26:00 +0000
@@ -68,45 +68,26 @@
         
         seahorse = ooldtp.context(self.name)
         
-        try:
-            mnu_new_key = seahorse.getchild(self.MNU_NEWKEY)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The new key menu was not found."
-
-        try:
-            mnu_new_key.selectmenuitem() 
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "There was a problem when selecting new key menu item."
-
-        try:
-            ldtp.waittillguiexist(self.NEWKEY_DLG)
-            dlg_new_key = ooldtp.context(self.NEWKEY_DLG)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The new key dialog was not found."
-
-        try:
-            table  = dlg_new_key.getchild(role = 'table')
-            types_table = table[0]
-
-            for i in range(0, types_table.getrowcount(), 1):
-                text = types_table.getcellvalue(i, 1)
-                candidate = text.split('\n')[0]
-                if candidate == key_type:
-                    types_table.selectrowindex(i)
-                    break
-                ldtp.wait(1)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error getting the key types table."
-
-        try:
-            btn_continue = dlg_new_key.getchild(self.BTN_CONTINUE)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The continue button at the new key dialog was not found."
-
-        try:
-            btn_continue.click() 
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "There was a problem when clicking the continue button."
+        mnu_new_key = seahorse.getchild(self.MNU_NEWKEY)
+        mnu_new_key.selectmenuitem() 
+
+        ldtp.waittillguiexist(self.NEWKEY_DLG)
+        dlg_new_key = ooldtp.context(self.NEWKEY_DLG)
+
+        table  = dlg_new_key.getchild(role = 'table')
+        types_table = table[0]
+
+        for i in range(0, types_table.getrowcount(), 1):
+            text = types_table.getcellvalue(i, 1)
+            candidate = text.split('\n')[0]
+            if candidate == key_type:
+                types_table.selectrowindex(i)
+                break
+            ldtp.wait(1)
+
+        btn_continue = dlg_new_key.getchild(self.BTN_CONTINUE)
+
+        btn_continue.click() 
         
     def new_pgp_key(self, full_name, email, comment, passphrase):
         """
@@ -130,78 +111,36 @@
         
         self.new_key(self.TYPE_PGP)
 
-        try:
-            ldtp.waittillguiexist(self.NEWPGP_DLG)
-            dlg_new_pgp = ooldtp.context(self.NEWPGP_DLG)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The new key dialog was not found."
-
-        try:
-            txt_field = dlg_new_pgp.getchild(self.DLG_NEWPGP_FULLNAME)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The " + txt_field + " text field was not found."
-        try:
-            txt_field.settextvalue(full_name)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "There was an error when writing the text."
-
-        try:
-            txt_field = dlg_new_pgp.getchild(self.DLG_NEWPGP_EMAIL)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The " + txt_field + " text field was not found."
-        try:
-            txt_field.settextvalue(email)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "There was a problem when writing the text."
+        ldtp.waittillguiexist(self.NEWPGP_DLG)
+        dlg_new_pgp = ooldtp.context(self.NEWPGP_DLG)
+
+        txt_field = dlg_new_pgp.getchild(self.DLG_NEWPGP_FULLNAME)
+        txt_field.settextvalue(full_name)
+
+        txt_field = dlg_new_pgp.getchild(self.DLG_NEWPGP_EMAIL)
+        txt_field.settextvalue(email)
    
-        try:
-            txt_field = dlg_new_pgp.getchild(self.DLG_NEWPGP_COMMENT)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The " + txt_field + " text field was not found."
-        try:
-            txt_field.settextvalue(comment)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "There was a problem when writing the text."
-
-        try:
-            btn_create = dlg_new_pgp.getchild(self.BTN_NEWPGP_CREATE)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The create button at the new PGP key dialog was not found."
-
-        try:
-            btn_create.click() 
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "There was a problem when clicking the create button."
+        txt_field = dlg_new_pgp.getchild(self.DLG_NEWPGP_COMMENT)
+        txt_field.settextvalue(comment)
+
+        btn_create = dlg_new_pgp.getchild(self.BTN_NEWPGP_CREATE)
+        btn_create.click() 
        
-        try:
-            ldtp.waittillguiexist(self.DLG_NEWKEY_PASS)
-            dlg_new_pgp_pass = ooldtp.context(self.DLG_NEWKEY_PASS)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The new pgp key passphrase dialog was not found."
-
-        try:
-            ldtp.enterstring(passphrase)
-            ldtp.enterstring("<tab>")
-            ldtp.enterstring(passphrase)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error entering passphrase."
- 
-        try:
-            btn_pass_ok = dlg_new_pgp_pass.getchild(self.BTN_PASS_OK)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The OK button at the new PGP key passphrase dialog was not found."
-
-        try:
-            btn_pass_ok.click() 
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "There was a problem when clicking the OK button."
- 
-        try:
-            ldtp.waittillguiexist(self.DLG_GENERATING_KEY)
-            while ldtp.guiexist(self.DLG_GENERATING_KEY) == 1:
-                ldtp.wait(1)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The new pgp generating key dialog was not found."
+        ldtp.waittillguiexist(self.DLG_NEWKEY_PASS)
+        dlg_new_pgp_pass = ooldtp.context(self.DLG_NEWKEY_PASS)
+
+        # Entering the passphrase
+        ldtp.enterstring(passphrase)
+        ldtp.enterstring("<tab>")
+        ldtp.enterstring(passphrase)
+ 
+        btn_pass_ok = dlg_new_pgp_pass.getchild(self.BTN_PASS_OK)
+
+        btn_pass_ok.click() 
+ 
+        ldtp.waittillguiexist(self.DLG_GENERATING_KEY)
+        while ldtp.guiexist(self.DLG_GENERATING_KEY) == 1:
+            ldtp.wait(1)
 
         # Add key name to generated key list, so we know to delete it later.
         self.generated_keys.append('  '.join([full_name, email, "'"+comment+"'"]))
@@ -230,105 +169,49 @@
         
         self.new_key(self.TYPE_SSH)
 
-        try:
-            ldtp.waittillguiexist(self.NEWSSH_DLG)
-            dlg_new_ssh = ooldtp.context(self.NEWSSH_DLG)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The new key dialog was not found."
+        ldtp.waittillguiexist(self.NEWSSH_DLG)
+        dlg_new_ssh = ooldtp.context(self.NEWSSH_DLG)
 
-        try:
-            txt_field = dlg_new_ssh.getchild(self.DLG_NEWSSH_DESC)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The " + self.DLG_NEWSSH_DESC + " text field was not found."
-        try:
-            txt_field.settextvalue(description)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "There was an error when writing the text."
+        txt_field = dlg_new_ssh.getchild(self.DLG_NEWSSH_DESC)
+        txt_field.settextvalue(description)
 
         if set_up == True:
-            try:
-                btn_create = dlg_new_ssh.getchild(self.BTN_NEWSSH_CREATE_AND_SETUP)
-            except ldtp.LdtpExecutionError:
-                raise ldtp.LdtpExecutionError, "The create button at the new PGP key dialog was not found."
-
+            btn_create = dlg_new_ssh.getchild(self.BTN_NEWSSH_CREATE_AND_SETUP)
         else:
-            try:
-                btn_create = dlg_new_ssh.getchild(self.BTN_NEWSSH_CREATE)
-            except ldtp.LdtpExecutionError:
-                raise ldtp.LdtpExecutionError, "The create button at the new PGP key dialog was not found."
+            btn_create = dlg_new_ssh.getchild(self.BTN_NEWSSH_CREATE)
 
-        try:
-            btn_create.click() 
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "There was a problem when clicking the create button."
+        btn_create.click() 
       
  
-        try:
-            ldtp.waittillguiexist(self.DLG_NEWKEY_PASS)
-            dlg_new_key_pass = ooldtp.context(self.DLG_NEWKEY_PASS)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The new key passphrase dialog was not found."
+        ldtp.waittillguiexist(self.DLG_NEWKEY_PASS)
+        dlg_new_key_pass = ooldtp.context(self.DLG_NEWKEY_PASS)
 
-        try:
-            ldtp.enterstring(passphrase)
-            ldtp.enterstring("<tab>")
-            ldtp.enterstring(passphrase)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error entering passphrase."
+        # Entering the passphrase
+        ldtp.enterstring(passphrase)
+        ldtp.enterstring("<tab>")
+        ldtp.enterstring(passphrase)
  
-        try:
-            btn_pass_ok = dlg_new_key_pass.getchild(self.BTN_PASS_OK)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The OK button at the new key passphrase dialog was not found."
-
-        try:
-            btn_pass_ok.click() 
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "There was a problem when clicking the OK button."
+        btn_pass_ok = dlg_new_key_pass.getchild(self.BTN_PASS_OK)
+        btn_pass_ok.click() 
  
         if set_up == True and login is not None:
 
-            try:
-                ldtp.waittillguiexist(self.DLG_SET_UP)
-                dlg_set_up_computer = ooldtp.context(self.DLG_SET_UP)
-            except ldtp.LdtpExecutionError:
-                raise ldtp.LdtpExecutionError, "The set up computer dialog was not found."
+            ldtp.waittillguiexist(self.DLG_SET_UP)
+            dlg_set_up_computer = ooldtp.context(self.DLG_SET_UP)
 
-            try:
-                txt_field = dlg_set_up_computer.getchild(self.TXT_SET_UP_LOGIN)
-            except ldtp.LdtpExecutionError:
-                raise ldtp.LdtpExecutionError, "The " + self.TXT_SET_UP_LOGIN + " text field was not found."
-            try:
-                txt_field.settextvalue(login)
-            except ldtp.LdtpExecutionError:
-                raise ldtp.LdtpExecutionError, "There was an error when writing the text."
+            txt_field = dlg_set_up_computer.getchild(self.TXT_SET_UP_LOGIN)
+            txt_field.settextvalue(login)
 
         if set_up == True:
-            try:
-                txt_field = dlg_set_up_computer.getchild(self.TXT_SET_UP_COMPUTER)
-            except ldtp.LdtpExecutionError:
-                raise ldtp.LdtpExecutionError, "The " + self.TXT_SET_UP_COMPUTER + " text field was not found."
-            try:
-                txt_field.settextvalue(computer)
-            except ldtp.LdtpExecutionError:
-                raise ldtp.LdtpExecutionError, "There was an error when writing the text."
-
-            try:
-                btn_set_up = dlg_set_up_computer.getchild(self.BTN_SET_UP)
-            except ldtp.LdtpExecutionError:
-                raise ldtp.LdtpExecutionError, "The set up button was not found."
-
-            try:
-                btn_set_up.click() 
-            except ldtp.LdtpExecutionError:
-                raise ldtp.LdtpExecutionError, "There was a problem when clicking the set up button."
-            
-        try:
-            while ldtp.guiexist(self.DLG_CREATING_SSH) == 1:
-                ldtp.wait(1)
-            
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The creating key dialog was not found."
+            txt_field = dlg_set_up_computer.getchild(self.TXT_SET_UP_COMPUTER)
+            txt_field.settextvalue(computer)
+
+            btn_set_up = dlg_set_up_computer.getchild(self.BTN_SET_UP)
+            btn_set_up.click() 
+            
+        while ldtp.guiexist(self.DLG_CREATING_SSH) == 1:
+            ldtp.wait(1)
+            
         # Add key name to generated key list, so we know to delete it later.
         self.generated_keys.append(description)
 

=== modified file 'mago/application/ubuntu_menu.py'
--- mago/application/ubuntu_menu.py	2010-06-28 21:46:54 +0000
+++ mago/application/ubuntu_menu.py	2010-10-20 10:26:00 +0000
@@ -27,10 +27,7 @@
        
         topPanel = ooldtp.context(self.__class__.TOP_PANEL)
         
-        try:
-            actualMenu = topPanel.getchild(menu_item_txt)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The " + menu_item_txt + " menu was not found. " 
+        actualMenu = topPanel.getchild(menu_item_txt)
       
         actualMenu.selectmenuitem()
 

=== modified file 'mago/application/update_manager.py'
--- mago/application/update_manager.py	2010-07-22 10:43:18 +0000
+++ mago/application/update_manager.py	2010-10-20 10:26:00 +0000
@@ -29,18 +29,18 @@
     
     i.e. C{updateManager = UpdateManager("my_password")}
     """
-    MNU_ITEM        = _("mnuUpdateManager"
-    WINDOW          = _("frmUpdateManager"
+    MNU_ITEM        = _("mnuUpdateManager")
+    WINDOW          = _("frmUpdateManager")
     LAUNCHER        = "update-manager"
-    BTN_CLOSE       = _("btnClose"
-    BTN_CHECK       = _("btnCheck"
-    BTN_INSTALL     = _("btnInstallUpdates"
-    TBL_UPDATES     = _("updates"
-    BAN_LIST        = _(" updates"
-    TAB_CHANGES     = _("Changes"
-    TXT_DESCRIPTION = _("Description"
-    LBL_WAIT        = _("lblKeepyoursystemup-to-date"
-    LBL_UPTODATE    = _("lblYoursystemisup-to-date"
+    BTN_CLOSE       = _("btnClose")
+    BTN_CHECK       = _("btnCheck")
+    BTN_INSTALL     = _("btnInstallUpdates")
+    TBL_UPDATES     = _("updates")
+    BAN_LIST        = _(" updates")
+    TAB_CHANGES     = _("Changes")
+    TXT_DESCRIPTION = _("Description")
+    LBL_WAIT        = _("lblKeepyoursystemup-to-date")
+    LBL_UPTODATE    = _("lblYoursystemisup-to-date")
     LBL_N_UPDATES   = r_('lblYoucaninstall(\d+)updates?')
     LBL_DOWNLOADSIZE = r_(r'lblDownloadsize((\d+)((\.)(\d+))?)(.*)') 
 
@@ -96,20 +96,16 @@
 
         populating = True
 
-        try:
-            while populating:
-                populating = False
-                self.remap()
+        while populating:
+            populating = False
+            self.remap()
 
-                label = updateManager.getchild(role = 'label')
-                for i in label:
-                    label_name = i.getName()
-                    if label_name == self.LBL_WAIT:
-                        populating = True
+            label = updateManager.getchild(role = 'label')
+            for i in label:
+                label_name = i.getName()
+                if label_name == self.LBL_WAIT:
+                    populating = True
         
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The Update Manager description label was not found."
-    
     def close(self):
         """
         It closes the update-manager window using the close button.
@@ -117,12 +113,9 @@
 
         updateManager = ooldtp.context(self.name)
     
-        try:
-            closeButton = updateManager.getchild(self.BTN_CLOSE)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The Update Manager Close button was not found."
-          
+        closeButton = updateManager.getchild(self.BTN_CLOSE)
         closeButton.click()
+        
         ldtp.waittillguinotexist (self.name)
            
     def number_updates(self):
@@ -135,21 +128,16 @@
         """
         updateManager = ooldtp.context(self.name)
 
-        try:
-            label = updateManager.getchild(role = 'label')
-            for i in label:
-                label_name = i.getName()
-                if label_name == self.LBL_UPTODATE:
-                    return 0
-                else:
-                    groups = re.match(self.LBL_N_UPDATES, label_name)
-                    if groups:
-                        number = groups.group(1)
-                        return int(number)
-
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error getting number of updates"
-
+        label = updateManager.getchild(role = 'label')
+        for i in label:
+            label_name = i.getName()
+            if label_name == self.LBL_UPTODATE:
+                return 0
+            else:
+                groups = re.match(self.LBL_N_UPDATES, label_name)
+                if groups:
+                    number = groups.group(1)
+                    return int(number)
         return 0
 
     def download_size(self):
@@ -160,31 +148,27 @@
         """
         updateManager = ooldtp.context(self.name) 
 
-        try:
-            label = updateManager.getchild(role = 'label')
-            for i in label:
-                label_name = i.getName()
-                groups = re.match(self.LBL_DOWNLOADSIZE, label_name)
+        label = updateManager.getchild(role = 'label')
+        for i in label:
+            label_name = i.getName()
+            groups = re.match(self.LBL_DOWNLOADSIZE, label_name)
                 
-                if groups:
-                    # Calculate size based on the tag after the number
-                    tag_size = groups.group(6)
-                    if tag_size == 'B':
-                        size = 1
-                    elif tag_size == 'KB':
-                        size = 1024
-                    elif tag_size == 'MB':
-                        size = 1048576
-                    elif tag_size == 'GB':
-                        size = 1073741824
-                    else:
-                        size = 0
-
-                    total_size = float(groups.group(1)) * size
-                    return total_size
-
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error getting the download size."
+            if groups:
+                # Calculate size based on the tag after the number
+                tag_size = groups.group(6)
+                if tag_size == 'B':
+                    size = 1
+                elif tag_size == 'KB':
+                    size = 1024
+                elif tag_size == 'MB':
+                    size = 1048576
+                elif tag_size == 'GB':
+                    size = 1073741824
+                else:
+                    size = 0
+
+                total_size = float(groups.group(1)) * size
+                return total_size
 
         return 0.0
 
@@ -194,15 +178,12 @@
         """
         updateManager = ooldtp.context(self.name) 
 
-        try:
-            table  = updateManager.getchild(self.TBL_UPDATES, role = 'table')
-            updates_table = table[0]
+        table  = updateManager.getchild(self.TBL_UPDATES, role = 'table')
+        updates_table = table[0]
 
-            for i in range(0, updates_table.getrowcount(), 1):
-                updates_table.checkrow(i)
-                ldtp.wait(1)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error getting the updates table."
+        for i in range(0, updates_table.getrowcount(), 1):
+            updates_table.checkrow(i)
+            ldtp.wait(1)
 
         return 0
 
@@ -212,22 +193,18 @@
         """
         updateManager = ooldtp.context(self.name) 
 
-        try:
-            table  = updateManager.getchild(self.TBL_UPDATES, role = 'table')
-            updates_table = table[0]
+        table  = updateManager.getchild(self.TBL_UPDATES, role = 'table')
+        updates_table = table[0]
 
-            # TODO: When table admits right click, use the context menu
+        # TODO: When table admits right click, use the context menu
+        self.remap()
+        size_updates = self.download_size()
+        while size_updates > 0:
+            for i in range(0, updates_table.getrowcount(), 1):
+                updates_table.uncheckrow(i)
+                ldtp.wait(1)
             self.remap()
             size_updates = self.download_size()
-            while size_updates > 0:
-                for i in range(0, updates_table.getrowcount(), 1):
-                    updates_table.uncheckrow(i)
-                    ldtp.wait(1)
-                self.remap()
-                size_updates = self.download_size()
- 
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error getting the updates table."
 
         return 0
 
@@ -242,18 +219,15 @@
 
         available_updates = []
 
-        try:
-            table  = updateManager.getchild(self.TBL_UPDATES, role = 'table')
-            updates_table = table[0]
+        table  = updateManager.getchild(self.TBL_UPDATES, role = 'table')
+        updates_table = table[0]
 
-            for i in range(0, updates_table.getrowcount(), 1):
-                text = updates_table.getcellvalue(i, 1)
-                candidate = text.split('\n')[0]
-                if candidate.find(self.BAN_LIST) == -1:
-                    available_updates.append(candidate)
-                ldtp.wait(1)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error getting the updates table."
+        for i in range(0, updates_table.getrowcount(), 1):
+            text = updates_table.getcellvalue(i, 1)
+            candidate = text.split('\n')[0]
+            if candidate.find(self.BAN_LIST) == -1:
+                available_updates.append(candidate)
+            ldtp.wait(1)
 
         return available_updates
 
@@ -267,19 +241,16 @@
 
         updateManager = ooldtp.context(self.name)
 
-        try:
-            table  = updateManager.getchild(self.TBL_UPDATES, role = 'table')
-            updates_table = table[0]
+        table  = updateManager.getchild(self.TBL_UPDATES, role = 'table')
+        updates_table = table[0]
 
-            for i in range(0, updates_table.getrowcount(), 1):
-                text = updates_table.getcellvalue(i, 1)
-                candidate = text.split('\n')[0]
-                if candidate == name:
-                    updates_table.selectrowindex(i)
-                    break
-                ldtp.wait(1)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error getting the updates table."
+        for i in range(0, updates_table.getrowcount(), 1):
+            text = updates_table.getcellvalue(i, 1)
+            candidate = text.split('\n')[0]
+            if candidate == name:
+                updates_table.selectrowindex(i)
+                break
+            ldtp.wait(1)
 
     def tick_update(self, name):
         """
@@ -291,19 +262,16 @@
 
         updateManager = ooldtp.context(self.name)
 
-        try:
-            table  = updateManager.getchild(self.TBL_UPDATES, role = 'table')
-            updates_table = table[0]
+        table  = updateManager.getchild(self.TBL_UPDATES, role = 'table')
+        updates_table = table[0]
 
-            for i in range(0, updates_table.getrowcount(), 1):
-                text = updates_table.getcellvalue(i, 1)
-                candidate = text.split('\n')[0]
-                if candidate == name:
-                    updates_table.checkrow(i)
-                    break
-                ldtp.wait(1)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Error getting the updates table."
+        for i in range(0, updates_table.getrowcount(), 1):
+            text = updates_table.getcellvalue(i, 1)
+            candidate = text.split('\n')[0]
+            if candidate == name:
+                updates_table.checkrow(i)
+                break
+            ldtp.wait(1)
 
     def check_updates(self):
         """
@@ -313,10 +281,7 @@
         raise an error if the UpdateManager instance was created without password.
         """
 
-        try:
-            updateManager = ooldtp.context(self.name)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The Update Manager window was not found."
+        updateManager = ooldtp.context(self.name)
         
         if self.password == "":
             raise ldtp.LdtpExecutionError, "Checking for updates requires administrative permissions."
@@ -325,11 +290,7 @@
         # We will need administrative permission
         polKit = PolicyKit(self.password)
 
-        try:
-            checkButton = updateManager.getchild(self.BTN_CHECK)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The Update Manager Check button was not found."
-          
+        checkButton = updateManager.getchild(self.BTN_CHECK)
         checkButton.click()
  
         # Administrative permissions
@@ -348,18 +309,11 @@
         If no updates are available, it won't do anything.
         """
 
-        try:
-            updateManager = ooldtp.context(self.name)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The Update Manager window was not found."
+        updateManager = ooldtp.context(self.name)
 
         # If there is any update available, install it
         if self.number_updates() > 0:
-            
-            try:
-                btnInstall = updateManager.getchild(self.BTN_INSTALL)
-            except ldtp.LdtpExecutionError:
-                raise ldtp.LdtpExecutionError, "The Update Manager install button was not found."
+            btnInstall = updateManager.getchild(self.BTN_INSTALL)
             
             if btnInstall.stateenabled():
                 btnInstall.click()
@@ -374,11 +328,7 @@
                     polKit.set_password()
         
         # Wait for the the close button to be ready
-        try:
-            btnClose = updateManager.getchild(self.BTN_CLOSE)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The Update Manager Close button was not found."
-        
+        btnClose = updateManager.getchild(self.BTN_CLOSE)
         while not btnClose.stateenabled():
             ldtp.wait(5)
             
@@ -389,16 +339,10 @@
         @return: True if the install button is enabled. False, otherwise.
         """
 
-        try:
-            updateManager = ooldtp.context(self.name)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The Update Manager window was not found."
+        updateManager = ooldtp.context(self.name)
         
-        try:
-            btnTest = updateManager.getchild(self.BTN_INSTALL)
-            state = btnTest.stateenabled()
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The install button was not found."
+        btnTest = updateManager.getchild(self.BTN_INSTALL)
+        state = btnTest.stateenabled()
         
         return state
 
@@ -426,22 +370,16 @@
 
         @return: The decription of the packages, as shown in the application
         """
-        try:
-            updateManager = ooldtp.context(self.name)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The Update Manager window was not found."
+        updateManager = ooldtp.context(self.name)
         
-        try:
-            if name != '':
-                self.select_update(name)
+        if name != '':
+            self.select_update(name)
 
-            # Get the description text field 
-            text_field = updateManager.getchild(self.TXT_DESCRIPTION, role='text')
-             # Get the text 
-            text = ldtp.gettextvalue(self.name, text_field[0].getName())
-            return text
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The description text was not found."
+        # Get the description text field 
+        text_field = updateManager.getchild(self.TXT_DESCRIPTION, role='text')
+         # Get the text 
+        text = ldtp.gettextvalue(self.name, text_field[0].getName())
+        return text
         
         return '' 
 
@@ -457,27 +395,21 @@
 
         @return: The decription of the changes
         """
-        try:
-            ooldtp.context(self.name)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The Update Manager window was not found."
+        ooldtp.context(self.name)
         
-        try:
-            if name != '':
-                self.select_update(name)
+        if name != '':
+            self.select_update(name)
 
-            # Get the filler tab
-            filler = ldtp.getobjectproperty(self.name , self.TAB_CHANGES, 'children')
-            # Get the scroll pane
-            scroll_pane = ldtp.getobjectproperty(self.name , filler, 'children')
-            # Get the text field
-            text_field = ldtp.getobjectproperty(self.name , scroll_pane, 'children')
-            text_field = text_field.split(' ')[0]
-            # Get the text
-            text = ldtp.gettextvalue(self.name, text_field)
-            return text
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The Changes tab was not found."
+        # Get the filler tab
+        filler = ldtp.getobjectproperty(self.name , self.TAB_CHANGES, 'children')
+        # Get the scroll pane
+        scroll_pane = ldtp.getobjectproperty(self.name , filler, 'children')
+        # Get the text field
+        text_field = ldtp.getobjectproperty(self.name , scroll_pane, 'children')
+        text_field = text_field.split(' ')[0]
+        # Get the text
+        text = ldtp.gettextvalue(self.name, text_field)
+        return text
         
         return '' 
 
@@ -488,18 +420,12 @@
         @type show: boolean
         @param show: True, to show the description; False, to hide the description.
         """
-        try:
-            updateManager = ooldtp.context(self.name)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The Update Manager window was not found."
+        updateManager = ooldtp.context(self.name)
         
-        try:
-            toggle_button = updateManager.getchild(role='toggle button')
-            state = toggle_button[0].verifytoggled()
+        toggle_button = updateManager.getchild(role='toggle button')
+        state = toggle_button[0].verifytoggled()
 
-            if state != show:
-                toggle_button[0].click()
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The description button was not found."
+        if state != show:
+            toggle_button[0].click()
         
         return state

=== modified file 'mago/test_suite/gedit.py'
--- mago/test_suite/gedit.py	2010-06-28 18:58:01 +0000
+++ mago/test_suite/gedit.py	2010-10-20 10:26:00 +0000
@@ -18,15 +18,9 @@
 
     def cleanup(self):
         # Exit using the Quit menu 
-        try:
-            try:
-                gedit = ooldtp.context(self.application.name)
-                quit_menu = gedit.getchild(self.application.MNU_CLOSE)
-            except ldtp.LdtpExecutionError:
-                raise ldtp.LdtpExecutionError, "The quit menu was not found."
-            quit_menu.selectmenuitem()
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "Mmm, something went wrong when closing the application."
+        gedit = ooldtp.context(self.application.name)
+        quit_menu = gedit.getchild(self.application.MNU_CLOSE)
+        quit_menu.selectmenuitem()
 
         result = ldtp.waittillguiexist(self.application.QUESTION_DLG,
                                        guiTimeOut = 2)
@@ -36,11 +30,8 @@
             question_dlg_btn_close = question_dialog.getchild(self.application.QUESTION_DLG_BTN_CLOSE)
             question_dlg_btn_close.click()
         
-        try:
-            gedit = ooldtp.context(self.application.name)
-            new_menu = gedit.getchild(self.application.MNU_NEW)
-        except ldtp.LdtpExecutionError:
-            raise ldtp.LdtpExecutionError, "The new menu was not found."
+        gedit = ooldtp.context(self.application.name)
+        new_menu = gedit.getchild(self.application.MNU_NEW)
         new_menu.selectmenuitem()
 
         result = ldtp.waittillguiexist(