diff --git a/tests/__init__.py b/tests/__init__.py index b26eaeb..20af68e 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,4 +1,3 @@ - def run_tests(): import unittest test_suite = unittest.TestSuite() diff --git a/wicd/misc.py b/wicd/misc.py index f3e2abe..476df90 100644 --- a/wicd/misc.py +++ b/wicd/misc.py @@ -564,14 +564,6 @@ def stringToNone(text): else: return str(text) -def stringToBoolean(text): - """ Turns a string representation of a bool to a boolean if needed. """ - if text in ("True", "1"): - return True - if text in ("False", "0"): - return False - return bool(text) - def checkboxTextboxToggle(checkbox, textboxes): for textbox in textboxes: textbox.set_sensitive(checkbox.get_active()) diff --git a/wicd/netentry.py b/wicd/netentry.py index 2e94691..b9581d1 100644 --- a/wicd/netentry.py +++ b/wicd/netentry.py @@ -19,7 +19,7 @@ import gtk import os import misc -from misc import noneToString, stringToNone, noneToBlankString, stringToBoolean +from misc import noneToString, stringToNone, noneToBlankString, to_bool import wpath language = misc.get_language_list_gui() @@ -526,7 +526,7 @@ class WiredNetworkEntry(NetworkEntry): self.script_button.connect("button-press-event", self.edit_scripts) # Toggle the default profile checkbox to the correct state. - if stringToBoolean(wired.GetWiredProperty("default")): + if to_bool(wired.GetWiredProperty("default")): self.chkbox_default_profile.set_active(True) else: self.chkbox_default_profile.set_active(False) @@ -666,7 +666,7 @@ class WiredNetworkEntry(NetworkEntry): self.advanced_dialog.prof_name = profile_name is_default = wired.GetWiredProperty("default") - self.chkbox_default_profile.set_active(stringToBoolean(is_default)) + self.chkbox_default_profile.set_active(to_bool(is_default)) def format_entry(self, label): """ Help method for fetching/formatting wired properties. """ @@ -728,7 +728,7 @@ class WirelessNetworkEntry(NetworkEntry): self.vbox_top.pack_start(self.chkbox_autoconnect, False, False) self.vbox_top.pack_start(self.hbox_status, True, True) - if stringToBoolean(self.format_entry(networkID, "automatic")): + if to_bool(self.format_entry(networkID, "automatic")): self.chkbox_autoconnect.set_active(True) else: self.chkbox_autoconnect.set_active(False)