Catch exception when querrying config options
Summary: Querrying config options, that are not found in the config file will no longer throw IOError. Test Plan: Configure a ieee8021x secured wifi and set one of the options to 'None'. Reloading the configuration (service) view will now work with selected (None) option. Reviewers: leif CC: FillFeile Differential Revision: https://phab.enlightenment.org/D490
This commit is contained in:
parent
d648f6ae47
commit
4593c1e7ec
|
@ -310,6 +310,11 @@ def config_get(name):
|
||||||
else:
|
else:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
def config_option_get(secname, key):
|
||||||
|
if configs.has_option(secname, key):
|
||||||
|
return configs.get(secname, key)
|
||||||
|
return None
|
||||||
|
|
||||||
def config_exists(name):
|
def config_exists(name):
|
||||||
if config_get(name):
|
if config_get(name):
|
||||||
return True
|
return True
|
||||||
|
@ -986,24 +991,28 @@ class ServiceView(ObjectView):
|
||||||
self.eap_method, self.eap_method_items = self.add_segment_control(
|
self.eap_method, self.eap_method_items = self.add_segment_control(
|
||||||
bx, options, self._on_eap_method)
|
bx, options, self._on_eap_method)
|
||||||
if cfg_sec:
|
if cfg_sec:
|
||||||
conf_val = configs.get(cfg_sec, 'EAP')
|
conf_val = config_option_get(cfg_sec, 'EAP')
|
||||||
if conf_val == "peap":
|
if conf_val == "peap":
|
||||||
self.eap_method_items["PEAP"].selected = True
|
self.eap_method_items["PEAP"].selected = True
|
||||||
elif conf_val == "tls":
|
elif conf_val == "tls":
|
||||||
self.eap_method_items["TLS"].selected = True
|
self.eap_method_items["TLS"].selected = True
|
||||||
elif conf_val == "ttls":
|
elif conf_val == "ttls":
|
||||||
self.eap_method_items["TTLS"].selected = True
|
self.eap_method_items["TTLS"].selected = True
|
||||||
|
elif conf_val == None:
|
||||||
|
self.eap_method_items["None"].selected = True
|
||||||
|
|
||||||
options = ("TLS", "MSCHAPv2", "None")
|
options = ("TLS", "MSCHAPv2", "None")
|
||||||
lb = self.add_label(bx, "Phase2:")
|
lb = self.add_label(bx, "Phase2:")
|
||||||
self.phase2, self.phase2_items = self.add_segment_control(
|
self.phase2, self.phase2_items = self.add_segment_control(
|
||||||
bx, options, self._on_phase2)
|
bx, options, self._on_phase2)
|
||||||
if cfg_sec:
|
if cfg_sec:
|
||||||
conf_val = configs.get(cfg_sec, 'Phase2')
|
conf_val = config_option_get(cfg_sec, 'Phase2')
|
||||||
if conf_val == "tls":
|
if conf_val == "tls":
|
||||||
self.phase2_items["TLS"].selected = True
|
self.phase2_items["TLS"].selected = True
|
||||||
elif conf_val == "MSCHAPV2":
|
elif conf_val == "MSCHAPV2":
|
||||||
self.phase2_items["MSCHAPv2"].selected = True
|
self.phase2_items["MSCHAPv2"].selected = True
|
||||||
|
elif conf_val == None:
|
||||||
|
self.phase2_items["None"].selected = True
|
||||||
|
|
||||||
def add_readonly_section(self, title, fields):
|
def add_readonly_section(self, title, fields):
|
||||||
fr, bx = self.add_frame_and_box(self.box, title)
|
fr, bx = self.add_frame_and_box(self.box, title)
|
||||||
|
|
Loading…
Reference in New Issue