PEP8 fixes

This commit is contained in:
Tomas Groth 2015-03-09 20:57:39 +00:00
parent aefe3e9cad
commit 39c79aaed9
7 changed files with 12 additions and 12 deletions

View File

@ -717,8 +717,8 @@ class SlideController(DisplayController, RegistryProperties):
self.play_slides_loop.setChecked(False) self.play_slides_loop.setChecked(False)
self.play_slides_loop.setIcon(build_icon(':/media/media_time.png')) self.play_slides_loop.setIcon(build_icon(':/media/media_time.png'))
if item.is_text(): if item.is_text():
if (Settings().value(self.main_window.songs_settings_section + '/display songbar') if (Settings().value(self.main_window.songs_settings_section + '/display songbar') and
and not self.song_menu.menu().isEmpty()): not self.song_menu.menu().isEmpty()):
self.toolbar.set_widget_visible(['song_menu'], True) self.toolbar.set_widget_visible(['song_menu'], True)
if item.is_capable(ItemCapabilities.CanLoop) and len(item.get_frames()) > 1: if item.is_capable(ItemCapabilities.CanLoop) and len(item.get_frames()) > 1:
self.toolbar.set_widget_visible(LOOP_LIST) self.toolbar.set_widget_visible(LOOP_LIST)

View File

@ -70,8 +70,8 @@ class AlertsManager(OpenLPMixin, RegistryMixin, QtCore.QObject, RegistryProperti
""" """
Format and request the Alert and start the timer. Format and request the Alert and start the timer.
""" """
if not self.alert_list or (self.live_controller.display.screens.display_count == 1 if not self.alert_list or (self.live_controller.display.screens.display_count == 1 and
and not Settings().value('core/display on monitor')): not Settings().value('core/display on monitor')):
return return
text = self.alert_list.pop(0) text = self.alert_list.pop(0)
alert_tab = self.parent().settings_tab alert_tab = self.parent().settings_tab

View File

@ -179,6 +179,6 @@ class WorshipAssistantImport(SongImport):
cleaned_verse_order_list.append(verse) cleaned_verse_order_list.append(verse)
self.verse_order_list = cleaned_verse_order_list self.verse_order_list = cleaned_verse_order_list
if not self.finish(): if not self.finish():
self.log_error(translate('SongsPlugin.WorshipAssistantImport', 'Record %d') % index self.log_error(translate('SongsPlugin.WorshipAssistantImport', 'Record %d') % index +
+ (': "' + self.title + '"' if self.title else '')) (': "' + self.title + '"' if self.title else ''))
songs_file.close() songs_file.close()

View File

@ -118,8 +118,8 @@ class ZionWorxImport(SongImport):
self.add_verse(verse) self.add_verse(verse)
title = self.title title = self.title
if not self.finish(): if not self.finish():
self.log_error(translate('SongsPlugin.ZionWorxImport', 'Record %d') % index self.log_error(translate('SongsPlugin.ZionWorxImport', 'Record %d') % index +
+ (': "' + title + '"' if title else '')) (': "' + title + '"' if title else ''))
def _decode(self, str): def _decode(self, str):
""" """