Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert so that it will work with python 2.5 for branch32.

Browse Source 
svn: r15971
This commit is contained in:
Peter Landgren 2010-10-12 06:09:35 +00:00
parent 9d207fd48f
commit 8e841be786
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/dbloader.py
View File

@ -86,14 +86,7 @@ class DbLoader(CLIDbLoader):
return 1 return 1
def _dberrordialog(self, msg): def _dberrordialog(self, msg):
import traceback DBErrorDialog(str(msg.value))
exc = traceback.format_exc()
try:
DBErrorDialog(str(msg.value))
_LOG.error(str(msg.value))
except:
DBErrorDialog(str(msg))
_LOG.error(str(msg) +"\n" + exc)
def _begin_progress(self): def _begin_progress(self):
self.uistate.set_busy_cursor(1) self.uistate.set_busy_cursor(1)
@ -319,9 +312,8 @@ class DbLoader(CLIDbLoader):
except Errors.DbError, msg: except Errors.DbError, msg:
self.dbstate.no_database() self.dbstate.no_database()
self._dberrordialog(msg) self._dberrordialog(msg)
except Exception as newerror: except Exception:
self.dbstate.no_database() self.dbstate.no_database()
self._dberrordialog(str(newerror))
self._end_progress() self._end_progress()
return True return True