Refactoring

functions/fmod_common_info.py

@@ -12,9 +12,9 @@ from settingsd import logger
 ##### Private constants #####
 SERVICE_NAME = "common_info"
 
-COMMON_INFO_LSB_RELASE_METHODS_NAMESPACE = "commonInfo.lsb.release"
-COMMON_INFO_UNAME_METHODS_NAMESPACE = "commonInfo.uname"
-COMMON_INFO_TIME_METHODS_NAMESPACE = "commonInfo.time"
+LSB_RELASE_METHODS_NAMESPACE = "commonInfo.lsb.release"
+UNAME_METHODS_NAMESPACE = "commonInfo.uname"
+TIME_METHODS_NAMESPACE = "commonInfo.time"
 
 LSB_OPTION_VERSION = "--version"
 LSB_OPTION_ID = "--id"
@@ -42,63 +42,63 @@ class CommonInfo(service.FunctionObject) :
 
 	### DBus methods ###
 
-	@service.functionMethod(COMMON_INFO_LSB_RELASE_METHODS_NAMESPACE, out_signature="s")
+	@service.functionMethod(LSB_RELASE_METHODS_NAMESPACE, out_signature="s")
 	def version(self) :
 		return self.lsbOption(LSB_OPTION_VERSION)
 
-	@service.functionMethod(COMMON_INFO_LSB_RELASE_METHODS_NAMESPACE, out_signature="s")
+	@service.functionMethod(LSB_RELASE_METHODS_NAMESPACE, out_signature="s")
 	def id(self) :
 		return self.lsbOption(LSB_OPTION_ID)
 
-	@service.functionMethod(COMMON_INFO_LSB_RELASE_METHODS_NAMESPACE, out_signature="s")
+	@service.functionMethod(LSB_RELASE_METHODS_NAMESPACE, out_signature="s")
 	def description(self) :
 		return self.lsbOption(LSB_OPTION_DESCRIPTION)
 
-	@service.functionMethod(COMMON_INFO_LSB_RELASE_METHODS_NAMESPACE, out_signature="s")
+	@service.functionMethod(LSB_RELASE_METHODS_NAMESPACE, out_signature="s")
 	def release(self) :
 		return self.lsbOption(LSB_OPTION_RELEASE)
 
-	@service.functionMethod(COMMON_INFO_LSB_RELASE_METHODS_NAMESPACE, out_signature="s")
+	@service.functionMethod(LSB_RELASE_METHODS_NAMESPACE, out_signature="s")
 	def codeName(self) :
 		return self.lsbOption(LSB_OPTION_CODE_NAME)
 
 	###
 
-	@service.functionMethod(COMMON_INFO_UNAME_METHODS_NAMESPACE, out_signature="s")
+	@service.functionMethod(UNAME_METHODS_NAMESPACE, out_signature="s")
 	def kernelName(self) :
 		return self.unameOption(UNAME_OPTION_KERNEL_NAME)
 
-	@service.functionMethod(COMMON_INFO_UNAME_METHODS_NAMESPACE, out_signature="s")
+	@service.functionMethod(UNAME_METHODS_NAMESPACE, out_signature="s")
 	def kernelVersion(self) :
 		return self.unameOption(UNAME_OPTION_KERNEL_VERSION)
 
-	@service.functionMethod(COMMON_INFO_UNAME_METHODS_NAMESPACE, out_signature="s")
+	@service.functionMethod(UNAME_METHODS_NAMESPACE, out_signature="s")
 	def nodeName(self) :
 		return self.unameOption(UNAME_OPTION_NODE_NAME)
 
-	@service.functionMethod(COMMON_INFO_UNAME_METHODS_NAMESPACE, out_signature="s")
+	@service.functionMethod(UNAME_METHODS_NAMESPACE, out_signature="s")
 	def release(self) :
 		return self.unameOption(UNAME_OPTION_RELEASE)
 
-	@service.functionMethod(COMMON_INFO_UNAME_METHODS_NAMESPACE, out_signature="s")
+	@service.functionMethod(UNAME_METHODS_NAMESPACE, out_signature="s")
 	def machine(self) :
 		return self.unameOption(UNAME_OPTION_MACHINE)
 
-	@service.functionMethod(COMMON_INFO_UNAME_METHODS_NAMESPACE, out_signature="s")
+	@service.functionMethod(UNAME_METHODS_NAMESPACE, out_signature="s")
 	def processor(self) :
 		return self.unameOption(UNAME_OPTION_PROCESSOR)
 
-	@service.functionMethod(COMMON_INFO_UNAME_METHODS_NAMESPACE, out_signature="s")
+	@service.functionMethod(UNAME_METHODS_NAMESPACE, out_signature="s")
 	def hardwarePlatform(self) :
 		return self.unameOption(UNAME_OPTION_HARDWARE_PLATFORM)
 
-	@service.functionMethod(COMMON_INFO_UNAME_METHODS_NAMESPACE, out_signature="s")
+	@service.functionMethod(UNAME_METHODS_NAMESPACE, out_signature="s")
 	def operatingSystem(self) :
 		return self.unameOption(UNAME_OPTION_OPERATING_SYSTEM)
 
 	###
 
-	@service.functionMethod(COMMON_INFO_TIME_METHODS_NAMESPACE, out_signature="d")
+	@service.functionMethod(TIME_METHODS_NAMESPACE, out_signature="d")
 	def uptime(self) :
 		uptime_file = open("/proc/uptime")
 		uptime = float(uptime_file.read().split()[0])

functions/fmod_example.py

@@ -12,7 +12,7 @@ from settingsd import shared
 SERVICE_NAME = "example"
 
 EXAMPLE_METHODS_NAMESPACE = "example"
-SETTINGSD_SHARED_OBJECT_METHODS_NAMESPACE = "com.example.settingsd.sharedObject"
+SHARED_OBJECT_METHODS_NAMESPACE = "com.example.settingsd.sharedObject"
 DBUS_METHODS_NAMESPACE = "dbus"
 
 
@@ -35,12 +35,12 @@ class Example(service.FunctionObject) :
 
 	###
 
-	@service.customMethod(SETTINGSD_SHARED_OBJECT_METHODS_NAMESPACE)
+	@service.customMethod(SHARED_OBJECT_METHODS_NAMESPACE)
 	def die(self) :
 		self.removeFromConnection() # shared.Functions.test.example.removeFromConnection()
 		self.shared().removeSharedObject(self.name()) # shared.Functions.test.removeSharedObject("example")
 
-	@service.customMethod(SETTINGSD_SHARED_OBJECT_METHODS_NAMESPACE, out_signature="s")
+	@service.customMethod(SHARED_OBJECT_METHODS_NAMESPACE, out_signature="s")
 	def path(self) :
 		return service.FunctionObject.path(self)
 

functions/fmod_settingsd.py

@@ -9,8 +9,8 @@ from settingsd import dbus_tools
 
 
 ##### Private constants #####
-SETTINGSD_LOGGER_METHODS_NAMESPACE = dbus_tools.joinMethod(const.DEFAULT_SERVICE_NAME, "logger")
-SETTINGSD_APPLICATION_METHODS_NAMESPACE = dbus_tools.joinMethod(const.DEFAULT_SERVICE_NAME, "application")
+LOGGER_METHODS_NAMESPACE = dbus_tools.joinMethod(const.DEFAULT_SERVICE_NAME, "logger")
+APPLICATION_METHODS_NAMESPACE = dbus_tools.joinMethod(const.DEFAULT_SERVICE_NAME, "application")
 
 
 ##### Private classes #####
@@ -18,13 +18,13 @@ class Settingsd(service.CustomObject) :
 
 	### DBus methods ###
 
-	@service.customMethod(SETTINGSD_LOGGER_METHODS_NAMESPACE, in_signature="i")
+	@service.customMethod(LOGGER_METHODS_NAMESPACE, in_signature="i")
 	def setLogLevel(self, log_level) :
 		config.setValue(config.APPLICATION_SECTION, "log_level", log_level)
 
 	###
 
-	@service.customMethod(SETTINGSD_APPLICATION_METHODS_NAMESPACE)
+	@service.customMethod(APPLICATION_METHODS_NAMESPACE)
 	def quit(self) :
 		config.value(config.RUNTIME_SECTION, "application").quit()