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

Unicode madness

This commit is contained in:
Tim Bentley 2013-02-12 18:37:51 +00:00
parent a73d4cce08
commit 193e96ee5a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openlp/core/lib/settings.py
View File

@ -343,8 +343,13 @@ class Settings(QtCore.QSettings):
"""
# On OS X (and probably on other platforms too) empty value from QSettings is represented as type
# PyQt4.QtCore.QPyNullVariant. This type has to be converted to proper 'None' Python type.
if setting.isNull() and isinstance(setting, QtCore.QPyNullVariant):
setting = None
# Python wants the test one way but nose wants it the other way Madness!
try:
if isinstance(setting, QtCore.QPyNullVariant) and setting.isNull():
setting = None
except AttributeError:
if setting.isNull() and isinstance(setting, QtCore.QPyNullVariant):
setting = None
# Handle 'None' type (empty value) properly.
if setting is None:
# An empty string saved to the settings results in a None type being returned.