raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Explicitly declare exceptions

Browse Source
This commit is contained in:
Jon Tibble 2010-05-27 17:00:51 +01:00
parent dc96d471e6
commit 4616bbcb36
6 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/lib/toolbar.py
View File

@ -120,7 +120,7 @@ class OpenLPToolbar(QtGui.QToolBar):
try: try:
if self.icons[title]: if self.icons[title]:
return self.icons[title] return self.icons[title]
except: except NameError:
log.exception(u'getIconFromTitle - no icon for %s' % title) log.exception(u'getIconFromTitle - no icon for %s' % title)
return QtGui.QIcon() return QtGui.QIcon()

6
openlp/core/ui/servicemanager.py
View File

@ -590,7 +590,7 @@ class ServiceManager(QtGui.QWidget):
zip.close() zip.close()
try: try:
os.remove(servicefile) os.remove(servicefile)
except IOError: except (IOError, OSError):
pass #if not present do not worry pass #if not present do not worry
name = filename.split(os.path.sep) name = filename.split(os.path.sep)
self.serviceName = name[-1] self.serviceName = name[-1]
@ -668,7 +668,7 @@ class ServiceManager(QtGui.QWidget):
try: try:
if os.path.isfile(p_file): if os.path.isfile(p_file):
os.remove(p_file) os.remove(p_file)
except IOError: except (IOError, OSError):
log.exception(u'Failed to remove osd file') log.exception(u'Failed to remove osd file')
except IOError: except IOError:
log.exception(u'Problem loading a service file') log.exception(u'Problem loading a service file')
@ -701,7 +701,7 @@ class ServiceManager(QtGui.QWidget):
try: try:
if os.path.isfile(file_path): if os.path.isfile(file_path):
os.remove(file_path) os.remove(file_path)
except: except OSError:
log.exception(u'Failed to clean up servicePath') log.exception(u'Failed to clean up servicePath')
def onThemeComboBoxSelected(self, currentIndex): def onThemeComboBoxSelected(self, currentIndex):

13
openlp/core/ui/thememanager.py
View File

@ -203,7 +203,7 @@ class ThemeManager(QtGui.QWidget):
os.remove(os.path.join(self.path, th)) os.remove(os.path.join(self.path, th))
os.remove(os.path.join(self.thumbPath, th)) os.remove(os.path.join(self.thumbPath, th))
shutil.rmtree(os.path.join(self.path, theme)) shutil.rmtree(os.path.join(self.path, theme))
except: except OSError:
#if not present do not worry #if not present do not worry
pass pass
# As we do not reload the themes push out the change # As we do not reload the themes push out the change
@ -238,7 +238,7 @@ class ThemeManager(QtGui.QWidget):
zip.write( zip.write(
os.path.join(source, name), os.path.join(source, name),
os.path.join(theme, name)) os.path.join(theme, name))
except: except (IOError, OSError):
log.exception(u'Export Theme Failed') log.exception(u'Export Theme Failed')
finally: finally:
if zip: if zip:
@ -358,11 +358,10 @@ class ThemeManager(QtGui.QWidget):
outfile = open(fullpath, u'wb') outfile = open(fullpath, u'wb')
outfile.write(zip.read(file)) outfile.write(zip.read(file))
self.generateAndSaveImage(dir, themename, filexml) self.generateAndSaveImage(dir, themename, filexml)
except: except IOError:
QtGui.QMessageBox.critical( QtGui.QMessageBox.critical(
self, self.trUtf8('Error'), self, self.trUtf8('Error'),
self.trUtf8('File is not a valid theme.'), self.trUtf8('File is not a valid theme.'))
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
log.exception(u'Importing theme from zip file failed %s' % filename) log.exception(u'Importing theme from zip file failed %s' % filename)
finally: finally:
if zip: if zip:
@ -454,7 +453,7 @@ class ThemeManager(QtGui.QWidget):
try: try:
outfile = open(theme_file, u'w') outfile = open(theme_file, u'w')
outfile.write(theme_pretty_xml) outfile.write(theme_pretty_xml)
except: except IOError:
log.exception(u'Saving theme to file failed') log.exception(u'Saving theme to file failed')
finally: finally:
if outfile: if outfile:
@ -462,7 +461,7 @@ class ThemeManager(QtGui.QWidget):
if image_from and image_from != image_to: if image_from and image_from != image_to:
try: try:
shutil.copyfile(image_from, image_to) shutil.copyfile(image_from, image_to)
except: except IOError:
log.exception(u'Failed to save theme image') log.exception(u'Failed to save theme image')
self.generateAndSaveImage(self.path, name, theme_xml) self.generateAndSaveImage(self.path, name, theme_xml)
self.loadThemes() self.loadThemes()

15
openlp/migration/migratebibles.py
View File

@ -143,7 +143,7 @@ class MigrateBibles(object):
try: try:
self.session.add(testament) self.session.add(testament)
self.session.commit() self.session.commit()
except: except InvalidRequestError:
self.session.rollback() self.session.rollback()
print u'Error thrown = ', sys.exc_info()[1] print u'Error thrown = ', sys.exc_info()[1]
self.progress(u'Create book table') self.progress(u'Create book table')
@ -157,7 +157,7 @@ class MigrateBibles(object):
try: try:
self.session.add(book) self.session.add(book)
self.session.commit() self.session.commit()
except: except InvalidRequestError:
self.session.rollback() self.session.rollback()
print u'Error thrown = ', sys.exc_info()[1] print u'Error thrown = ', sys.exc_info()[1]
self.progress(u'Create verse table') self.progress(u'Create verse table')
@ -171,14 +171,10 @@ class MigrateBibles(object):
verse.text = verse_temp.text verse.text = verse_temp.text
try: try:
self.session.add(verse) self.session.add(verse)
except: self.session.commit()
except InvalidRequestError:
self.session.rollback() self.session.rollback()
print u'Error thrown = ', sys.exc_info()[1] print u'Error thrown = ', sys.exc_info()[1]
try:
self.session.commit()
except:
self.session.rollback()
print u'Error thrown = ', sys.exc_info()[1]
self.progress(u'Create metadata table') self.progress(u'Create metadata table')
results = self.session.query(TBibleMeta).order_by(TBibleMeta.key).all() results = self.session.query(TBibleMeta).order_by(TBibleMeta.key).all()
for biblemeta_temp in results: for biblemeta_temp in results:
@ -188,7 +184,7 @@ class MigrateBibles(object):
try: try:
self.session.add(biblemeta) self.session.add(biblemeta)
self.session.commit() self.session.commit()
except: except InvalidRequestError:
self.session.rollback() self.session.rollback()
print u'Error thrown = ', sys.exc_info()[1] print u'Error thrown = ', sys.exc_info()[1]
@ -206,3 +202,4 @@ class MigrateBibles(object):
conn.commit() conn.commit()
conn.execute(u'vacuum;') conn.execute(u'vacuum;')
conn.commit() conn.commit()

2
openlp/migration/migratesongs.py
View File

@ -159,7 +159,7 @@ class MigrateSongs(object):
try: try:
self.session.add(song) self.session.add(song)
self.session.commit() self.session.commit()
except: except InvalidRequestError:
self.session.rollback() self.session.rollback()
print u'Error thrown = ', sys.exc_info()[1] print u'Error thrown = ', sys.exc_info()[1]

4
openlp/plugins/alerts/lib/manager.py
View File

@ -80,7 +80,7 @@ class DBManager(object):
self.session.commit() self.session.commit()
log.debug(u'Alert saved') log.debug(u'Alert saved')
return True return True
except: except InvalidRequestError:
self.session.rollback() self.session.rollback()
log.exception(u'Alert save failed') log.exception(u'Alert save failed')
return False return False
@ -104,7 +104,7 @@ class DBManager(object):
self.session.delete(alert_item) self.session.delete(alert_item)
self.session.commit() self.session.commit()
return True return True
except: except InvalidRequestError:
self.session.rollback() self.session.rollback()
log.exception(u'Alert deleton failed') log.exception(u'Alert deleton failed')
return False return False