pep8 fixes

openlp/core/common/settings.py

@@ -1,4 +1,4 @@
-    # -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
 
 ###############################################################################

openlp/core/display/window.py

@@ -154,10 +154,8 @@ class DisplayWindow(QtWidgets.QWidget):
 
     def set_single_image(self, bg_color, image_path):
         """
-        
-        :param str bg_color: 
-        :param Path image_path: 
-        :return: 
+        :param str bg_color: Background color
+        :param Path image_path: Path to the image
         """
         image_uri = image_path.as_uri()
         self.run_javascript('Display.setFullscreenImage("{bg_color}", "{image}");'.format(bg_color=bg_color,
@@ -291,7 +289,7 @@ class DisplayWindow(QtWidgets.QWidget):
 
         :param rate: A float indicating the playback rate.
         """
-        self.run_javascript('Display.setPlaybackRate({rate});'.format(rate))
+        self.run_javascript('Display.setPlaybackRate({rate});'.format(rate=rate))
 
     def set_video_volume(self, level):
         """
@@ -304,7 +302,7 @@ class DisplayWindow(QtWidgets.QWidget):
         """
         if level < 0 or level > 100:
             raise ValueError('Volume should be from 0 to 100, was "{}"'.format(level))
-        self.run_javascript('Display.setVideoVolume({level});'.format(level))
+        self.run_javascript('Display.setVideoVolume({level});'.format(level=level))
 
     def toggle_video_mute(self):
         """

openlp/core/lib/htmlbuilder.py

@@ -685,19 +685,6 @@ def build_html(item, screen, is_live, background, image=None, plugins=None):
                                chords_css=build_chords_css())
 
 
-def webkit_version():
-    """
-    Return the Webkit version in use. Note method added relatively recently, so return 0 if prior to this
-    """
-    #try:
-    #    webkit_ver = float(QtWebKit.qWebKitVersion())
-    #    log.debug('Webkit version = {version}'.format(version=webkit_ver))
-    #except AttributeError:
-    #    webkit_ver = 0.0
-    webkit_ver = 0.0
-    return webkit_ver
-
-
 def build_background_css(item, width):
     """
     Build the background css

openlp/core/lib/serviceitem.py

@@ -178,7 +178,7 @@ class ServiceItem(RegistryProperties):
                     'title': raw_slide['title'],
                     'text': render_tags(page),
                     'verse': index,
-                    'footer' : self.foot_text,
+                    'footer': self.foot_text,
                 }
                 self._rendered_slides.append(rendered_slide)
                 display_slide = {

openlp/core/projectors/db.py

@@ -49,7 +49,6 @@ log = logging.getLogger(__name__)
 log.debug('projector.lib.db module loaded')
 
 
-
 Base = declarative_base(MetaData())
 
 

openlp/core/ui/firsttimewizard.py

@@ -33,6 +33,7 @@ from openlp.core.ui.icons import UiIcons
 from openlp.core.display.screens import ScreenList
 from openlp.core.widgets.widgets import ScreenSelectionWidget
 
+
 class FirstTimePage(object):
     """
     An enumeration class with each of the pages of the wizard.

openlp/core/ui/media/mediacontroller.py

@@ -452,7 +452,7 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties):
         # When called from mediaitem display is None
         if display is None:
             display = controller.preview_display
-        self.vlc_player.load(display)
+        self.vlc_player.load(display, filename)
         self.resize(display, self.vlc_player)
         self.current_media_players[controller.controller_type] = self.vlc_player
         if audio_track == -1 and subtitle_track == -1:

openlp/core/ui/settingsform.py

@@ -79,7 +79,7 @@ class SettingsForm(QtWidgets.QDialog, Ui_SettingsDialog, RegistryProperties):
         self.insert_tab(self.screens_tab)
         self.insert_tab(self.themes_tab)
         self.insert_tab(self.advanced_tab)
-        #self.insert_tab(self.player_tab)
+        # self.insert_tab(self.player_tab)
         self.insert_tab(self.projector_tab)
         self.insert_tab(self.api_tab)
         for plugin in State().list_plugins():

openlp/core/ui/slidecontroller.py

@@ -558,7 +558,6 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties):
 
         # TODO: Need to basically update everything
 
-
     def __add_actions_to_widget(self, widget):
         """
         Add actions to the widget specified by `widget`

openlp/core/ui/themeform.py

@@ -226,7 +226,7 @@ class ThemeForm(QtWidgets.QWizard, Ui_ThemeWizard, RegistryProperties):
         paint = QtGui.QPainter(pixmap)
         paint.setPen(QtGui.QPen(QtCore.Qt.blue, 2))
         main_rect = QtCore.QRect(self.theme.font_main_x, self.theme.font_main_y,
-                                self.theme.font_main_width - 1, self.theme.font_main_height - 1)
+                                 self.theme.font_main_width - 1, self.theme.font_main_height - 1)
         paint.drawRect(main_rect)
         paint.setPen(QtGui.QPen(QtCore.Qt.red, 2))
         footer_rect = QtCore.QRect(self.theme.font_footer_x, self.theme.font_footer_y,

openlp/core/widgets/widgets.py

@@ -290,7 +290,7 @@ class ScreenSelectionWidget(QtWidgets.QWidget):
         screen.is_display = self.display_group_box.isChecked()
         if self.custom_geometry_button.isChecked():
             screen.custom_geometry = QtCore.QRect(self.left_spin_box.value(), self.top_spin_box.value(),
-                                                   self.width_spin_box.value(), self.height_spin_box.value())
+                                                  self.width_spin_box.value(), self.height_spin_box.value())
         else:
             screen.custom_geometry = None
 

openlp/plugins/alerts/alertsplugin.py

@@ -259,8 +259,8 @@ class AlertsPlugin(Plugin):
         """
         align = VerticalType.Names[self.settings_tab.location]
         frame.runJavaScript('update_css("{align}", "{face}", "{size}", "{color}", '
-                                 '"{background}")'.format(align=align,
-                                                          face=self.settings_tab.font_face,
-                                                          size=self.settings_tab.font_size,
-                                                          color=self.settings_tab.font_color,
-                                                          background=self.settings_tab.background_color))
+                            '"{background}")'.format(align=align,
+                                                     face=self.settings_tab.font_face,
+                                                     size=self.settings_tab.font_size,
+                                                     color=self.settings_tab.font_color,
+                                                     background=self.settings_tab.background_color))

openlp/plugins/bibles/lib/db.py

@@ -164,7 +164,7 @@ class BibleDB(Manager):
             file_path = kwargs['file']
         Manager.__init__(self, 'bibles', init_schema, file_path, upgrade)
         if self.session and 'file' in kwargs:
-                self.get_name()
+            self.get_name()
         self._is_web_bible = None
 
     def get_name(self):

openlp/plugins/bibles/lib/mediaitem.py

@@ -797,8 +797,8 @@ class BibleMediaItem(MediaManagerItem):
                               'Please make sure that your reference follows one of these patterns:</strong><br><br>%s')
                     % UiStrings().BibleScriptureError % get_reference_separators())
         elif self.search_edit.current_search_type() == BibleSearch.Combined and get_reference_match('full').match(text):
-                # Valid reference found. Do reference search.
-                self.text_reference_search(text)
+            # Valid reference found. Do reference search.
+            self.text_reference_search(text)
         else:
             # It can only be a 'Combined' search without a valid reference, or a 'Text' search
             if self.search_status == SearchStatus.SearchAsYouType:

openlp/plugins/presentations/lib/impresscontroller.py

@@ -475,7 +475,8 @@ class ImpressDocument(PresentationDocument):
         notes = []
         pages = self.document.getDrawPages()
         for slide_no in range(1, pages.getCount() + 1):
-            titles.append(self.__get_text_from_page(slide_no, TextType.Title).replace('\r\n', ' ').replace('\n', ' ').strip())
+            titles.append(self.__get_text_from_page(slide_no, TextType.Title).replace('\r\n', ' ')
+                                                                             .replace('\n', ' ').strip())
             note = self.__get_text_from_page(slide_no, TextType.Notes)
             if len(note) == 0:
                 note = ' '

tests/functional/openlp_core/api/endpoint/test_controller.py

@@ -70,6 +70,7 @@ class TestController(TestCase):
             self.screens = ScreenList.create(self.desktop)
         # Mock the renderer and its format_slide method
         self.mocked_renderer = MagicMock()
+
         def side_effect_return_arg(arg1, arg2):
             return [arg1]
         self.mocked_slide_formater = MagicMock(side_effect=side_effect_return_arg)

tests/functional/openlp_core/lib/test_serviceitem.py

@@ -79,6 +79,7 @@ class TestServiceItem(TestCase, TestMixin):
         Registry.create()
         # Mock the renderer and its format_slide method
         mocked_renderer = MagicMock()
+
         def side_effect_return_arg(arg1, arg2):
             return [arg1]
         mocked_slide_formater = MagicMock(side_effect=side_effect_return_arg)
@@ -86,7 +87,6 @@ class TestServiceItem(TestCase, TestMixin):
         Registry().register('renderer', mocked_renderer)
         Registry().register('image_manager', MagicMock())
 
-
     def tearDown(self):
         """
         Clean up

tests/functional/openlp_plugins/bibles/test_osisimport.py

@@ -470,7 +470,7 @@ class TestOsisImportFileImports(TestCase):
             # THEN: The create_verse() method should have been called with each verse in the file.
             assert importer.create_verse.called is True
             for verse_tag, verse_text in test_data['verses']:
-                    importer.create_verse.assert_any_call(importer.create_book().id, 1, verse_tag, verse_text)
+                importer.create_verse.assert_any_call(importer.create_book().id, 1, verse_tag, verse_text)
 
     def test_file_import_milestone_tags(self):
         """

tests/functional/openlp_plugins/bibles/test_swordimport.py

@@ -37,7 +37,6 @@ except ImportError:
     HAS_PYSWORD = False
 
 
-
 TEST_PATH = RESOURCE_PATH / 'bibles'
 
 

tests/interfaces/openlp_plugins/media/forms/test_mediaclipselectorform.py

@@ -38,9 +38,6 @@ if os.name == 'nt' and not get_vlc():
     raise SkipTest('Windows without VLC, skipping this test since it cannot run without vlc')
 
 
-
-
-
 class TestMediaClipSelectorForm(TestCase, TestMixin):
     """
     Test the EditCustomSlideForm.