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

Pylint fixes

Browse Source
This commit is contained in:
Philip Ridout 2017-08-26 17:50:54 +01:00
parent 0e01ef29d4
commit 05e0f42859
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openlp/core/common/json.py
View File

@ -38,11 +38,11 @@ class OpenLPJsonDecoder(JSONDecoder):
instance and are passed to custom objects upon encoding or decoding. instance and are passed to custom objects upon encoding or decoding.
""" """
self.kwargs = kwargs self.kwargs = kwargs
if not object_hook: if object_hook is None:
object_hook = self.object_hook object_hook = self.custom_object_hook
super().__init__(object_hook, parse_float, parse_int, parse_constant, strict, object_pairs_hook) super().__init__(object_hook, parse_float, parse_int, parse_constant, strict, object_pairs_hook)
def object_hook(self, obj): def custom_object_hook(self, obj):
""" """
Implement a custom Path object decoder. Implement a custom Path object decoder.
@ -69,9 +69,11 @@ class OpenLPJsonEncoder(JSONEncoder):
to custom objects upon encoding or decoding. to custom objects upon encoding or decoding.
""" """
self.kwargs = kwargs self.kwargs = kwargs
if default is None:
default = self.custom_default
super().__init__(skipkeys, ensure_ascii, check_circular, allow_nan, sort_keys, indent, separators, default) super().__init__(skipkeys, ensure_ascii, check_circular, allow_nan, sort_keys, indent, separators, default)
def default(self, obj): def custom_default(self, obj):
""" """
Convert any Path objects into a dictionary object which can be serialized. Convert any Path objects into a dictionary object which can be serialized.

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

@ -387,7 +387,7 @@ class ThemeManager(OpenLPMixin, RegistryMixin, QtWidgets.QWidget, Ui_ThemeManage
self.application.set_busy_cursor() self.application.set_busy_cursor()
if export_path: if export_path:
Settings().setValue(self.settings_section + '/last directory export', export_path.parent) Settings().setValue(self.settings_section + '/last directory export', export_path.parent)
if self._export_theme(str(export_path, theme)): if self._export_theme(str(export_path), theme):
QtWidgets.QMessageBox.information(self, QtWidgets.QMessageBox.information(self,
translate('OpenLP.ThemeManager', 'Theme Exported'), translate('OpenLP.ThemeManager', 'Theme Exported'),
translate('OpenLP.ThemeManager', translate('OpenLP.ThemeManager',