1 new commit in StationPlaylist:
https://bitbucket.org/nvdaaddonteam/stationplaylist/commits/a96c3cb5ead1/
Changeset: a96c3cb5ead1
Branch: 7.0/indigoGoodbye50
User: josephsl
Date: 2016-01-27 05:58:14+00:00
Summary: 7.0-dev: Remove unnecessary reset variable and unused title string
in unlock routine.
Thanks to use of a separate runtime dictionary, it is no longer necessary to
store reset flag. Also, because error flags are stored into errors dictionary
when profiles are unlocked, there's no need to keep the title for the error
dialog around (besides, error dialog is no longer called from unlock routine).
With this, another vestige of add-on 5.x-style config is removed.
Affected #: 1 file
diff --git a/addon/appModules/splstudio/splconfig.py
b/addon/appModules/splstudio/splconfig.py
index d487425..5278cc0 100755
--- a/addon/appModules/splstudio/splconfig.py
+++ b/addon/appModules/splstudio/splconfig.py
@@ -202,8 +202,6 @@ def unlockConfig(path, profileName=None, prefill=False):
# 7.0: Make sure errors are displayed as config keys are now sections
and may need to go through subkeys.
configTest = SPLConfigCheckpoint.validate(_val, copy=prefill,
preserve_errors=True)
if configTest != True:
- # Translators: Standard error title for configuration error.
- title = _("Studio add-on Configuration error")
if not configTest:
# Case 1: restore settings to defaults when 5.x config
validation has failed on all values.
# 6.0: In case this is a user profile, apply base
configuration.
@@ -569,8 +567,6 @@ def saveConfig():
mergeSections(0)
_preSave(SPLConfigPool[0])
# Global flags, be gone.
- if "Reset" in SPLConfigPool[0]:
- del SPLConfigPool[0]["Reset"]
del SPLConfig["ColumnExpRange"]
# Convert keys back to 5.x format.
for section in SPLConfigPool[0].keys():
@@ -1426,8 +1422,6 @@ class SPLConfigDialog(gui.SettingsDialog):
SPLConfig["ActiveIndex"] = 0
SPLActiveProfile = SPLConfigPool[0].name
SPLConfig["ColumnExpRange"] = colRange
- # Workaround: store the reset flag in the normal
profile to prevent config databases from becoming references to old generation.
- SPLConfigPool[0]["Reset"] = True
if SPLSwitchProfile is not None:
SPLSwitchProfile = None
SPLPrevProfile = None
Repository URL: https://bitbucket.org/nvdaaddonteam/stationplaylist/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
