forked from openlp/openlp
Changed log.warn to log.warning
This commit is contained in:
parent
d61111ab89
commit
9b6979b840
@ -81,4 +81,4 @@ class OpenLPToolbar(QtGui.QToolBar):
|
|||||||
if handle in self.actions:
|
if handle in self.actions:
|
||||||
self.actions[handle].setVisible(visible)
|
self.actions[handle].setVisible(visible)
|
||||||
else:
|
else:
|
||||||
log.warn('No handle "%s" in actions list.', str(handle))
|
log.warning('No handle "%s" in actions list.', str(handle))
|
||||||
|
@ -172,7 +172,7 @@ def create_button(parent, name, **kwargs):
|
|||||||
kwargs.setdefault('icon', ':/services/service_down.png')
|
kwargs.setdefault('icon', ':/services/service_down.png')
|
||||||
kwargs.setdefault('tooltip', translate('OpenLP.Ui', 'Move selection down one position.'))
|
kwargs.setdefault('tooltip', translate('OpenLP.Ui', 'Move selection down one position.'))
|
||||||
else:
|
else:
|
||||||
log.warn('The role "%s" is not defined in create_push_button().', role)
|
log.warning('The role "%s" is not defined in create_push_button().', role)
|
||||||
if kwargs.pop('btn_class', '') == 'toolbutton':
|
if kwargs.pop('btn_class', '') == 'toolbutton':
|
||||||
button = QtGui.QToolButton(parent)
|
button = QtGui.QToolButton(parent)
|
||||||
else:
|
else:
|
||||||
@ -190,7 +190,7 @@ def create_button(parent, name, **kwargs):
|
|||||||
button.clicked.connect(kwargs.pop('click'))
|
button.clicked.connect(kwargs.pop('click'))
|
||||||
for key in list(kwargs.keys()):
|
for key in list(kwargs.keys()):
|
||||||
if key not in ['text', 'icon', 'tooltip', 'click']:
|
if key not in ['text', 'icon', 'tooltip', 'click']:
|
||||||
log.warn('Parameter %s was not consumed in create_button().', key)
|
log.warning('Parameter %s was not consumed in create_button().', key)
|
||||||
return button
|
return button
|
||||||
|
|
||||||
|
|
||||||
@ -275,7 +275,7 @@ def create_action(parent, name, **kwargs):
|
|||||||
action.triggered.connect(kwargs.pop('triggers'))
|
action.triggered.connect(kwargs.pop('triggers'))
|
||||||
for key in list(kwargs.keys()):
|
for key in list(kwargs.keys()):
|
||||||
if key not in ['text', 'icon', 'tooltip', 'statustip', 'checked', 'can_shortcuts', 'category', 'triggers']:
|
if key not in ['text', 'icon', 'tooltip', 'statustip', 'checked', 'can_shortcuts', 'category', 'triggers']:
|
||||||
log.warn('Parameter %s was not consumed in create_action().' % key)
|
log.warning('Parameter %s was not consumed in create_action().' % key)
|
||||||
return action
|
return action
|
||||||
|
|
||||||
|
|
||||||
|
@ -175,7 +175,7 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties):
|
|||||||
# On some platforms importing vlc.py might cause
|
# On some platforms importing vlc.py might cause
|
||||||
# also OSError exceptions. (e.g. Mac OS X)
|
# also OSError exceptions. (e.g. Mac OS X)
|
||||||
except (ImportError, OSError):
|
except (ImportError, OSError):
|
||||||
log.warn('Failed to import %s on path %s', module_name, path)
|
log.warning('Failed to import %s on path %s', module_name, path)
|
||||||
player_classes = MediaPlayer.__subclasses__()
|
player_classes = MediaPlayer.__subclasses__()
|
||||||
for player_class in player_classes:
|
for player_class in player_classes:
|
||||||
player = player_class(self)
|
player = player_class(self)
|
||||||
|
@ -279,7 +279,7 @@ class ActionList(object):
|
|||||||
actions.append(action)
|
actions.append(action)
|
||||||
ActionList.shortcut_map[shortcuts[1]] = actions
|
ActionList.shortcut_map[shortcuts[1]] = actions
|
||||||
else:
|
else:
|
||||||
log.warn('Shortcut "%s" is removed from "%s" because another action already uses this shortcut.' %
|
log.warning('Shortcut "%s" is removed from "%s" because another action already uses this shortcut.' %
|
||||||
(shortcuts[1], action.objectName()))
|
(shortcuts[1], action.objectName()))
|
||||||
shortcuts.remove(shortcuts[1])
|
shortcuts.remove(shortcuts[1])
|
||||||
# Check the primary shortcut.
|
# Check the primary shortcut.
|
||||||
@ -290,7 +290,7 @@ class ActionList(object):
|
|||||||
actions.append(action)
|
actions.append(action)
|
||||||
ActionList.shortcut_map[shortcuts[0]] = actions
|
ActionList.shortcut_map[shortcuts[0]] = actions
|
||||||
else:
|
else:
|
||||||
log.warn('Shortcut "%s" is removed from "%s" because another action already uses this shortcut.' %
|
log.warning('Shortcut "%s" is removed from "%s" because another action already uses this shortcut.' %
|
||||||
(shortcuts[0], action.objectName()))
|
(shortcuts[0], action.objectName()))
|
||||||
shortcuts.remove(shortcuts[0])
|
shortcuts.remove(shortcuts[0])
|
||||||
action.setShortcuts([QtGui.QKeySequence(shortcut) for shortcut in shortcuts])
|
action.setShortcuts([QtGui.QKeySequence(shortcut) for shortcut in shortcuts])
|
||||||
|
@ -423,7 +423,7 @@ class BibleUpgradeForm(OpenLPWizard):
|
|||||||
else:
|
else:
|
||||||
language_id = self.new_bibles[number].get_language(name)
|
language_id = self.new_bibles[number].get_language(name)
|
||||||
if not language_id:
|
if not language_id:
|
||||||
log.warn('Upgrading from "%s" failed' % filename[0])
|
log.warning('Upgrading from "%s" failed' % filename[0])
|
||||||
self.new_bibles[number].session.close()
|
self.new_bibles[number].session.close()
|
||||||
del self.new_bibles[number]
|
del self.new_bibles[number]
|
||||||
self.increment_progress_bar(
|
self.increment_progress_bar(
|
||||||
@ -444,7 +444,7 @@ class BibleUpgradeForm(OpenLPWizard):
|
|||||||
book_ref_id = self.new_bibles[number].\
|
book_ref_id = self.new_bibles[number].\
|
||||||
get_book_ref_id_by_name(book, len(books), language_id)
|
get_book_ref_id_by_name(book, len(books), language_id)
|
||||||
if not book_ref_id:
|
if not book_ref_id:
|
||||||
log.warn('Upgrading books from %s - download name: "%s" aborted by user' % (
|
log.warning('Upgrading books from %s - download name: "%s" aborted by user' % (
|
||||||
meta_data['download_source'], meta_data['download_name']))
|
meta_data['download_source'], meta_data['download_name']))
|
||||||
self.new_bibles[number].session.close()
|
self.new_bibles[number].session.close()
|
||||||
del self.new_bibles[number]
|
del self.new_bibles[number]
|
||||||
@ -457,7 +457,7 @@ class BibleUpgradeForm(OpenLPWizard):
|
|||||||
if oldbook:
|
if oldbook:
|
||||||
verses = old_bible.get_verses(oldbook['id'])
|
verses = old_bible.get_verses(oldbook['id'])
|
||||||
if not verses:
|
if not verses:
|
||||||
log.warn('No verses found to import for book "%s"', book)
|
log.warning('No verses found to import for book "%s"', book)
|
||||||
continue
|
continue
|
||||||
for verse in verses:
|
for verse in verses:
|
||||||
if self.stop_import_flag:
|
if self.stop_import_flag:
|
||||||
@ -472,7 +472,7 @@ class BibleUpgradeForm(OpenLPWizard):
|
|||||||
if not language_id:
|
if not language_id:
|
||||||
language_id = self.new_bibles[number].get_language(name)
|
language_id = self.new_bibles[number].get_language(name)
|
||||||
if not language_id:
|
if not language_id:
|
||||||
log.warn('Upgrading books from "%s" failed' % name)
|
log.warning('Upgrading books from "%s" failed' % name)
|
||||||
self.new_bibles[number].session.close()
|
self.new_bibles[number].session.close()
|
||||||
del self.new_bibles[number]
|
del self.new_bibles[number]
|
||||||
self.increment_progress_bar(
|
self.increment_progress_bar(
|
||||||
@ -493,7 +493,7 @@ class BibleUpgradeForm(OpenLPWizard):
|
|||||||
(number + 1, max_bibles, name, book['name']))
|
(number + 1, max_bibles, name, book['name']))
|
||||||
book_ref_id = self.new_bibles[number].get_book_ref_id_by_name(book['name'], len(books), language_id)
|
book_ref_id = self.new_bibles[number].get_book_ref_id_by_name(book['name'], len(books), language_id)
|
||||||
if not book_ref_id:
|
if not book_ref_id:
|
||||||
log.warn('Upgrading books from %s " failed - aborted by user' % name)
|
log.warning('Upgrading books from %s " failed - aborted by user' % name)
|
||||||
self.new_bibles[number].session.close()
|
self.new_bibles[number].session.close()
|
||||||
del self.new_bibles[number]
|
del self.new_bibles[number]
|
||||||
self.success[number] = False
|
self.success[number] = False
|
||||||
@ -503,7 +503,7 @@ class BibleUpgradeForm(OpenLPWizard):
|
|||||||
book_details['testament_id'])
|
book_details['testament_id'])
|
||||||
verses = old_bible.get_verses(book['id'])
|
verses = old_bible.get_verses(book['id'])
|
||||||
if not verses:
|
if not verses:
|
||||||
log.warn('No verses found to import for book "%s"', book['name'])
|
log.warning('No verses found to import for book "%s"', book['name'])
|
||||||
self.new_bibles[number].delete_book(db_book)
|
self.new_bibles[number].delete_book(db_book)
|
||||||
continue
|
continue
|
||||||
for verse in verses:
|
for verse in verses:
|
||||||
|
@ -165,7 +165,7 @@ class BGExtract(RegistryProperties):
|
|||||||
if len(verse_parts) > 1:
|
if len(verse_parts) > 1:
|
||||||
verse = int(verse_parts[0])
|
verse = int(verse_parts[0])
|
||||||
except TypeError:
|
except TypeError:
|
||||||
log.warn('Illegal verse number: %s', str(verse))
|
log.warning('Illegal verse number: %s', str(verse))
|
||||||
verses.append((verse, text))
|
verses.append((verse, text))
|
||||||
verse_list = {}
|
verse_list = {}
|
||||||
for verse, text in verses[::-1]:
|
for verse, text in verses[::-1]:
|
||||||
@ -198,7 +198,7 @@ class BGExtract(RegistryProperties):
|
|||||||
if len(verse_parts) > 1:
|
if len(verse_parts) > 1:
|
||||||
clean_verse_num = int(verse_parts[0])
|
clean_verse_num = int(verse_parts[0])
|
||||||
except TypeError:
|
except TypeError:
|
||||||
log.warn('Illegal verse number: %s', str(raw_verse_num))
|
log.warning('Illegal verse number: %s', str(raw_verse_num))
|
||||||
if clean_verse_num:
|
if clean_verse_num:
|
||||||
verse_text = raw_verse_num.next_element
|
verse_text = raw_verse_num.next_element
|
||||||
part = raw_verse_num.next_element.next_element
|
part = raw_verse_num.next_element.next_element
|
||||||
|
@ -123,7 +123,7 @@ class OpenSongBible(BibleDB):
|
|||||||
if len(verse_parts) > 1:
|
if len(verse_parts) > 1:
|
||||||
number = int(verse_parts[0])
|
number = int(verse_parts[0])
|
||||||
except TypeError:
|
except TypeError:
|
||||||
log.warn('Illegal verse number: %s', str(verse.attrib['n']))
|
log.warning('Illegal verse number: %s', str(verse.attrib['n']))
|
||||||
verse_number = number
|
verse_number = number
|
||||||
else:
|
else:
|
||||||
verse_number += 1
|
verse_number += 1
|
||||||
|
@ -129,7 +129,7 @@ class ImpressController(PresentationController):
|
|||||||
try:
|
try:
|
||||||
uno_instance = get_uno_instance(resolver)
|
uno_instance = get_uno_instance(resolver)
|
||||||
except:
|
except:
|
||||||
log.warn('Unable to find running instance ')
|
log.warning('Unable to find running instance ')
|
||||||
self.start_process()
|
self.start_process()
|
||||||
loop += 1
|
loop += 1
|
||||||
try:
|
try:
|
||||||
@ -138,7 +138,7 @@ class ImpressController(PresentationController):
|
|||||||
desktop = self.manager.createInstanceWithContext("com.sun.star.frame.Desktop", uno_instance)
|
desktop = self.manager.createInstanceWithContext("com.sun.star.frame.Desktop", uno_instance)
|
||||||
return desktop
|
return desktop
|
||||||
except:
|
except:
|
||||||
log.warn('Failed to get UNO desktop')
|
log.warning('Failed to get UNO desktop')
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def get_com_desktop(self):
|
def get_com_desktop(self):
|
||||||
@ -152,7 +152,7 @@ class ImpressController(PresentationController):
|
|||||||
try:
|
try:
|
||||||
desktop = self.manager.createInstance('com.sun.star.frame.Desktop')
|
desktop = self.manager.createInstance('com.sun.star.frame.Desktop')
|
||||||
except (AttributeError, pywintypes.com_error):
|
except (AttributeError, pywintypes.com_error):
|
||||||
log.warn('Failure to find desktop - Impress may have closed')
|
log.warning('Failure to find desktop - Impress may have closed')
|
||||||
return desktop if desktop else None
|
return desktop if desktop else None
|
||||||
|
|
||||||
def get_com_servicemanager(self):
|
def get_com_servicemanager(self):
|
||||||
@ -163,7 +163,7 @@ class ImpressController(PresentationController):
|
|||||||
try:
|
try:
|
||||||
return Dispatch('com.sun.star.ServiceManager')
|
return Dispatch('com.sun.star.ServiceManager')
|
||||||
except pywintypes.com_error:
|
except pywintypes.com_error:
|
||||||
log.warn('Failed to get COM service manager. Impress Controller has been disabled')
|
log.warning('Failed to get COM service manager. Impress Controller has been disabled')
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def kill(self):
|
def kill(self):
|
||||||
@ -180,7 +180,7 @@ class ImpressController(PresentationController):
|
|||||||
else:
|
else:
|
||||||
desktop = self.get_com_desktop()
|
desktop = self.get_com_desktop()
|
||||||
except:
|
except:
|
||||||
log.warn('Failed to find an OpenOffice desktop to terminate')
|
log.warning('Failed to find an OpenOffice desktop to terminate')
|
||||||
if not desktop:
|
if not desktop:
|
||||||
return
|
return
|
||||||
docs = desktop.getComponents()
|
docs = desktop.getComponents()
|
||||||
@ -198,7 +198,7 @@ class ImpressController(PresentationController):
|
|||||||
desktop.terminate()
|
desktop.terminate()
|
||||||
log.debug('OpenOffice killed')
|
log.debug('OpenOffice killed')
|
||||||
except:
|
except:
|
||||||
log.warn('Failed to terminate OpenOffice')
|
log.warning('Failed to terminate OpenOffice')
|
||||||
|
|
||||||
|
|
||||||
class ImpressDocument(PresentationDocument):
|
class ImpressDocument(PresentationDocument):
|
||||||
@ -244,7 +244,7 @@ class ImpressDocument(PresentationDocument):
|
|||||||
try:
|
try:
|
||||||
self.document = desktop.loadComponentFromURL(url, '_blank', 0, properties)
|
self.document = desktop.loadComponentFromURL(url, '_blank', 0, properties)
|
||||||
except:
|
except:
|
||||||
log.warn('Failed to load presentation %s' % url)
|
log.warning('Failed to load presentation %s' % url)
|
||||||
return False
|
return False
|
||||||
if os.name == 'nt':
|
if os.name == 'nt':
|
||||||
# As we can't start minimized the Impress window gets in the way.
|
# As we can't start minimized the Impress window gets in the way.
|
||||||
@ -318,7 +318,7 @@ class ImpressDocument(PresentationDocument):
|
|||||||
self.presentation = None
|
self.presentation = None
|
||||||
self.document.dispose()
|
self.document.dispose()
|
||||||
except:
|
except:
|
||||||
log.warn("Closing presentation failed")
|
log.warning("Closing presentation failed")
|
||||||
self.document = None
|
self.document = None
|
||||||
self.controller.remove_doc(self)
|
self.controller.remove_doc(self)
|
||||||
|
|
||||||
@ -335,7 +335,7 @@ class ImpressDocument(PresentationDocument):
|
|||||||
log.debug("getPresentation failed to find a presentation")
|
log.debug("getPresentation failed to find a presentation")
|
||||||
return False
|
return False
|
||||||
except:
|
except:
|
||||||
log.warn("getPresentation failed to find a presentation")
|
log.warning("getPresentation failed to find a presentation")
|
||||||
return False
|
return False
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
@ -98,7 +98,7 @@ class Controller(object):
|
|||||||
return True
|
return True
|
||||||
if not self.doc.is_loaded():
|
if not self.doc.is_loaded():
|
||||||
if not self.doc.load_presentation():
|
if not self.doc.load_presentation():
|
||||||
log.warn('Failed to activate %s' % self.doc.filepath)
|
log.warning('Failed to activate %s' % self.doc.filepath)
|
||||||
return False
|
return False
|
||||||
if self.is_live:
|
if self.is_live:
|
||||||
self.doc.start_presentation()
|
self.doc.start_presentation()
|
||||||
@ -109,7 +109,7 @@ class Controller(object):
|
|||||||
if self.doc.is_active():
|
if self.doc.is_active():
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
log.warn('Failed to activate %s' % self.doc.filepath)
|
log.warning('Failed to activate %s' % self.doc.filepath)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def slide(self, slide):
|
def slide(self, slide):
|
||||||
|
@ -90,7 +90,7 @@ class PresentationPlugin(Plugin):
|
|||||||
try:
|
try:
|
||||||
self.controllers[controller].start_process()
|
self.controllers[controller].start_process()
|
||||||
except Exception:
|
except Exception:
|
||||||
log.warn('Failed to start controller process')
|
log.warning('Failed to start controller process')
|
||||||
self.controllers[controller].available = False
|
self.controllers[controller].available = False
|
||||||
self.media_item.build_file_mask_string()
|
self.media_item.build_file_mask_string()
|
||||||
|
|
||||||
@ -134,7 +134,7 @@ class PresentationPlugin(Plugin):
|
|||||||
try:
|
try:
|
||||||
__import__(module_name, globals(), locals(), [])
|
__import__(module_name, globals(), locals(), [])
|
||||||
except ImportError:
|
except ImportError:
|
||||||
log.warn('Failed to import %s on path %s', module_name, path)
|
log.warning('Failed to import %s on path %s', module_name, path)
|
||||||
controller_classes = PresentationController.__subclasses__()
|
controller_classes = PresentationController.__subclasses__()
|
||||||
for controller_class in controller_classes:
|
for controller_class in controller_classes:
|
||||||
controller = controller_class(self)
|
controller = controller_class(self)
|
||||||
|
@ -152,7 +152,7 @@ class SongShowPlusImport(SongImport):
|
|||||||
if match:
|
if match:
|
||||||
self.ccli_number = int(match.group())
|
self.ccli_number = int(match.group())
|
||||||
else:
|
else:
|
||||||
log.warn("Can't parse CCLI Number from string: %s" % self.decode(data))
|
log.warning("Can't parse CCLI Number from string: %s" % self.decode(data))
|
||||||
elif block_key == VERSE:
|
elif block_key == VERSE:
|
||||||
self.add_verse(self.decode(data), "%s%s" % (VerseType.tags[VerseType.Verse], verse_no))
|
self.add_verse(self.decode(data), "%s%s" % (VerseType.tags[VerseType.Verse], verse_no))
|
||||||
elif block_key == CHORUS:
|
elif block_key == CHORUS:
|
||||||
|
@ -58,7 +58,7 @@ class WorshipCenterProImport(SongImport):
|
|||||||
try:
|
try:
|
||||||
conn = pyodbc.connect('DRIVER={Microsoft Access Driver (*.mdb)};DBQ=%s' % self.import_source)
|
conn = pyodbc.connect('DRIVER={Microsoft Access Driver (*.mdb)};DBQ=%s' % self.import_source)
|
||||||
except (pyodbc.DatabaseError, pyodbc.IntegrityError, pyodbc.InternalError, pyodbc.OperationalError) as e:
|
except (pyodbc.DatabaseError, pyodbc.IntegrityError, pyodbc.InternalError, pyodbc.OperationalError) as e:
|
||||||
log.warn('Unable to connect the WorshipCenter Pro database %s. %s', self.import_source, str(e))
|
log.warning('Unable to connect the WorshipCenter Pro database %s. %s', self.import_source, str(e))
|
||||||
# Unfortunately no specific exception type
|
# Unfortunately no specific exception type
|
||||||
self.log_error(self.import_source, translate('SongsPlugin.WorshipCenterProImport',
|
self.log_error(self.import_source, translate('SongsPlugin.WorshipCenterProImport',
|
||||||
'Unable to connect the WorshipCenter Pro database.'))
|
'Unable to connect the WorshipCenter Pro database.'))
|
||||||
|
Loading…
Reference in New Issue
Block a user