openlp-core team mailing list archive

[Tomas Groth <second@xxxxxx>]

Tomas Groth has proposed merging lp:~tomasgroth/openlp/nose2-fixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~tomasgroth/openlp/nose2-fixes/+merge/324816

Fixed songshowplus encoding issue.
Fixed issue where enable-chord settings was not setup correctly for tests.
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~tomasgroth/openlp/nose2-fixes into lp:openlp.

=== modified file 'openlp/core/ui/lib/pathedit.py'
--- openlp/core/ui/lib/pathedit.py	2017-05-22 18:22:43 +0000
+++ openlp/core/ui/lib/pathedit.py	2017-05-30 20:40:45 +0000
@@ -46,16 +46,16 @@
 
         :param parent: The parent of the widget. This is just passed to the super method.
         :type parent: QWidget or None
-        
+
         :param dialog_caption: Used to customise the caption in the QFileDialog.
         :param dialog_caption: str
-        
+
         :param default_path: The default path. This is set as the path when the revert button is clicked
         :type default_path: str
 
         :param show_revert: Used to determin if the 'revert button' should be visible.
         :type show_revert: bool
-        
+
         :return: None
         :rtype: None
         """
@@ -72,7 +72,7 @@
         Set up the widget
         :param show_revert: Show or hide the revert button
         :type show_revert: bool
-        
+
         :return: None
         :rtype: None
         """

=== modified file 'openlp/plugins/presentations/presentationplugin.py'
--- openlp/plugins/presentations/presentationplugin.py	2017-05-22 18:27:40 +0000
+++ openlp/plugins/presentations/presentationplugin.py	2017-05-30 20:40:45 +0000
@@ -1,4 +1,4 @@
-    # -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
 
 ###############################################################################

=== modified file 'openlp/plugins/songs/lib/importers/songshowplus.py'
--- openlp/plugins/songs/lib/importers/songshowplus.py	2016-12-31 11:01:36 +0000
+++ openlp/plugins/songs/lib/importers/songshowplus.py	2017-05-30 20:40:45 +0000
@@ -23,7 +23,6 @@
 The :mod:`songshowplus` module provides the functionality for importing SongShow Plus songs into the OpenLP
 database.
 """
-import chardet
 import os
 import logging
 import re
@@ -226,6 +225,7 @@
 
     def decode(self, data):
         try:
-            return str(data, chardet.detect(data)['encoding'])
+            # Don't question this, it works...
+            return data.decode('utf-8').encode('cp1251').decode('cp1251')
         except:
-            return str(data, retrieve_windows_encoding())
+            return data.decode(retrieve_windows_encoding())

=== modified file 'openlp/plugins/songusage/forms/songusagedetaildialog.py'
--- openlp/plugins/songusage/forms/songusagedetaildialog.py	2017-05-22 18:22:43 +0000
+++ openlp/plugins/songusage/forms/songusagedetaildialog.py	2017-05-30 20:40:45 +0000
@@ -69,7 +69,7 @@
         self.file_horizontal_layout.setSpacing(8)
         self.file_horizontal_layout.setContentsMargins(8, 8, 8, 8)
         self.file_horizontal_layout.setObjectName('file_horizontal_layout')
-        self.report_path_edit = PathEdit(self.file_group_box, path_type = PathType.Directories, show_revert=False)
+        self.report_path_edit = PathEdit(self.file_group_box, path_type=PathType.Directories, show_revert=False)
         self.file_horizontal_layout.addWidget(self.report_path_edit)
         self.vertical_layout.addWidget(self.file_group_box)
         self.button_box = create_button_box(song_usage_detail_dialog, 'button_box', ['cancel', 'ok'])

=== modified file 'tests/functional/openlp_plugins/songs/test_editverseform.py'
--- tests/functional/openlp_plugins/songs/test_editverseform.py	2017-04-24 05:17:55 +0000
+++ tests/functional/openlp_plugins/songs/test_editverseform.py	2017-05-30 20:40:45 +0000
@@ -27,10 +27,15 @@
 
 from PyQt5 import QtCore
 
+from openlp.core.common import Settings
 from openlp.plugins.songs.forms.editverseform import EditVerseForm
 
 from tests.helpers.testmixin import TestMixin
 
+__default_settings__ = {
+    'songs/enable chords': True,
+}
+
 
 class TestEditVerseForm(TestCase, TestMixin):
     """
@@ -40,9 +45,10 @@
         """
         Set up the components need for all tests.
         """
-        self.edit_verse_form = EditVerseForm(None)
         self.setup_application()
         self.build_settings()
+        Settings().extend_default_settings(__default_settings__)
+        self.edit_verse_form = EditVerseForm(None)
         QtCore.QLocale.setDefault(QtCore.QLocale('en_GB'))
 
     def tearDown(self):

=== modified file 'tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py'
--- tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py	2017-04-24 05:17:55 +0000
+++ tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py	2017-05-30 20:40:45 +0000
@@ -27,12 +27,16 @@
 
 from PyQt5 import QtWidgets
 
-from openlp.core.common import Registry
+from openlp.core.common import Registry, Settings
 from openlp.core.common.uistrings import UiStrings
 from openlp.plugins.songs.forms.editsongform import EditSongForm
 
 from tests.helpers.testmixin import TestMixin
 
+__default_settings__ = {
+    'songs/enable chords': True,
+}
+
 
 class TestEditSongForm(TestCase, TestMixin):
     """
@@ -48,12 +52,15 @@
         self.main_window = QtWidgets.QMainWindow()
         Registry().register('main_window', self.main_window)
         Registry().register('theme_manager', MagicMock())
+        self.build_settings()
+        Settings().extend_default_settings(__default_settings__)
         self.form = EditSongForm(MagicMock(), self.main_window, MagicMock())
 
     def tearDown(self):
         """
         Delete all the C++ objects at the end so that we don't have a segfault
         """
+        self.destroy_settings()
         del self.form
         del self.main_window
 

=== modified file 'tests/interfaces/openlp_plugins/songs/forms/test_editverseform.py'
--- tests/interfaces/openlp_plugins/songs/forms/test_editverseform.py	2016-12-31 11:01:36 +0000
+++ tests/interfaces/openlp_plugins/songs/forms/test_editverseform.py	2017-05-30 20:40:45 +0000
@@ -26,10 +26,14 @@
 
 from PyQt5 import QtCore, QtTest, QtWidgets
 
-from openlp.core.common import Registry
+from openlp.core.common import Registry, Settings
 from openlp.plugins.songs.forms.editverseform import EditVerseForm
 from tests.helpers.testmixin import TestMixin
 
+__default_settings__ = {
+    'songs/enable chords': True,
+}
+
 
 class TestEditVerseForm(TestCase, TestMixin):
     """
@@ -44,12 +48,15 @@
         self.setup_application()
         self.main_window = QtWidgets.QMainWindow()
         Registry().register('main_window', self.main_window)
+        self.build_settings()
+        Settings().extend_default_settings(__default_settings__)
         self.form = EditVerseForm()
 
     def tearDown(self):
         """
         Delete all the C++ objects at the end so that we don't have a segfault
         """
+        self.destroy_settings()
         del self.form
         del self.main_window
 

=== modified file 'tests/resources/songshowplussongs/a mighty fortress is our god.json'
--- tests/resources/songshowplussongs/a mighty fortress is our god.json	2014-05-03 08:47:31 +0000
+++ tests/resources/songshowplussongs/a mighty fortress is our god.json	2017-05-30 20:40:45 +0000
@@ -15,7 +15,7 @@
             "v1"
         ],
         [
-            "Did we in our own strength confide, our striving would be losing;\r\nWere not the right Man on our side, the Man of God’s own choosing:\r\nDost ask who that may be? Christ Jesus, it is He;\r\nLord Sabaoth, His Name, from age to age the same,\r\nAnd He must win the battle.\r\n",
+            "Did we in our own strength confide, our striving would be losing;\r\nWere not the right Man on our side, the Man of God’s own choosing:\r\nDost ask who that may be? Christ Jesus, it is He;\r\nLord Sabaoth, His Name, from age to age the same,\r\nAnd He must win the battle.\r\n",
             "v2"
         ],
         [
@@ -23,7 +23,7 @@
             "v3"
         ],
         [
-            "That word above all earthly powers, no thanks to them, abideth;\r\nThe Spirit and the gifts are ours through Him Who with us sideth:\r\nLet goods and kindred go, this mortal life also;\r\nThe body they may kill: God’s truth abideth still,\r\nHis kingdom is forever.\r\n",
+            "That word above all earthly powers, no thanks to them, abideth;\r\nThe Spirit and the gifts are ours through Him Who with us sideth:\r\nLet goods and kindred go, this mortal life also;\r\nThe body they may kill: God’s truth abideth still,\r\nHis kingdom is forever.\r\n",
             "v4"
         ]
     ]