Rename auto_cycle to auto_connect in config
User config is updated if appropriate. Add tests behaviour is as expected. Just the one rename-it reference to auto_cycle remains.
This commit is contained in:
@@ -64,6 +64,8 @@ class SimpleConfig(object):
|
||||
self.user_config = {} # for self.get in electrum_path()
|
||||
self.path = self.electrum_path()
|
||||
self.user_config = read_user_config_function(self.path)
|
||||
# Upgrade obsolete keys
|
||||
self.fixup_keys({'auto_cycle': 'auto_connect'})
|
||||
# Make a singleton instance of 'self'
|
||||
set_config(self)
|
||||
|
||||
@@ -81,6 +83,23 @@ class SimpleConfig(object):
|
||||
print_error("electrum directory", path)
|
||||
return path
|
||||
|
||||
def fixup_config_keys(self, config, keypairs):
|
||||
updated = False
|
||||
for old_key, new_key in keypairs.iteritems():
|
||||
if old_key in config:
|
||||
if not new_key in config:
|
||||
config[new_key] = config[old_key]
|
||||
del config[old_key]
|
||||
updated = True
|
||||
return updated
|
||||
|
||||
def fixup_keys(self, keypairs):
|
||||
'''Migrate old key names to new ones'''
|
||||
self.fixup_config_keys(self.cmdline_options, keypairs)
|
||||
self.fixup_config_keys(self.system_config, keypairs)
|
||||
if self.fixup_config_keys(self.user_config, keypairs):
|
||||
self.save_user_config()
|
||||
|
||||
def set_key(self, key, value, save = True):
|
||||
if not self.is_modifiable(key):
|
||||
print_stderr("Warning: not changing config key '%s' set on the command line" % key)
|
||||
|
||||
Reference in New Issue
Block a user