Refactoring

functions/fmod_example.py

@@ -58,7 +58,7 @@ class Service(service.Service) :
 		return "example"
 
 	@classmethod
-	def optionsList(self) :
+	def options(self) :
 		return [
 			(self.serviceName(), "hello_string", "Hello, World!", str)
 		]

functions/fmod_services.py

@@ -178,7 +178,7 @@ class Service(service.Service) :
 		return SERVICE_NAME
 
 	@classmethod
-	def optionsList(self) :
+	def options(self) :
 		return [
 			(SERVICE_NAME, "initd_dir_path", "/etc/init.d", str),
 			(SERVICE_NAME, "chkconfig_prog_path", "/sbin/chkconfig", str)

settingsd/server.py

@@ -69,7 +69,7 @@ class Server(object) :
 
 	def loadServicesConfigs(self) :
 		for service_name in self._services_dict.keys() :
-			service_options_list = list(self._services_dict[service_name]["service_class"].optionsList())
+			service_options_list = list(self._services_dict[service_name]["service_class"].options())
 			service_options_list.append((service_name, "enabled", "no", validators.validBool))
 
 			for service_options_list_item in service_options_list :

settingsd/service.py

@@ -41,7 +41,7 @@ class ServiceRequisitesInterface(object) :
 		pass
 
 	@classmethod
-	def optionsList(self) :
+	def options(self) :
 		return []