From 8e841be7864c315076f9ad9730f61b056bee5955 Mon Sep 17 00:00:00 2001
From: Peter Landgren <peter.talken@telia.com>
Date: Tue, 12 Oct 2010 06:09:35 +0000
Subject: [PATCH] Revert so that it will work with python 2.5 for branch32.

svn: r15971
---
 src/gui/dbloader.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/gui/dbloader.py b/src/gui/dbloader.py
index 572dc5ffb..888a82993 100644
--- a/src/gui/dbloader.py
+++ b/src/gui/dbloader.py
@@ -86,14 +86,7 @@ class DbLoader(CLIDbLoader):
         return 1
     
     def _dberrordialog(self, msg):
-        import traceback
-        exc = traceback.format_exc()
-        try:
-            DBErrorDialog(str(msg.value))
-            _LOG.error(str(msg.value))
-        except:
-            DBErrorDialog(str(msg))
-            _LOG.error(str(msg) +"\n" + exc)
+        DBErrorDialog(str(msg.value))
 			
     def _begin_progress(self):
         self.uistate.set_busy_cursor(1)
@@ -319,9 +312,8 @@ class DbLoader(CLIDbLoader):
         except Errors.DbError, msg:
             self.dbstate.no_database()
             self._dberrordialog(msg)
-        except Exception as newerror:
+        except Exception:
             self.dbstate.no_database()
-            self._dberrordialog(str(newerror))
         self._end_progress()
         return True