From a2756d2eec3769924407813c3b58d248de613d2f Mon Sep 17 00:00:00 2001 From: Frederic PAUT Date: Tue, 25 Jun 2013 10:55:09 +0200 Subject: [PATCH] Factorize creation of dynamic className (and ensure that's always the same) --- cloudeebus/cloudeebus.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cloudeebus/cloudeebus.py b/cloudeebus/cloudeebus.py index 49f857e..5a3eb4d 100755 --- a/cloudeebus/cloudeebus.py +++ b/cloudeebus/cloudeebus.py @@ -278,6 +278,10 @@ class XmlCbParser: # The target object of the parser +############################################################################### +def createClassName(objectPath): + return re.sub('/', '_', objectPath[1:]) + ################################################################################ class DynDBusClass(): def __init__(self, className, globalCtx, localCtx): @@ -613,7 +617,7 @@ class CloudeebusService: ''' self.agentObjectPath = list[0] xmlTemplate = list[1] - self.className = re.sub('/', '_', self.agentObjectPath[1:]) + self.className = createClassName(self.agentObjectPath) if (self.dynDBusClasses.has_key(self.className) == False): self.dynDBusClasses[self.className] = DynDBusClass(self.className, self.globalCtx, self.localCtx) self.dynDBusClasses[self.className].createDBusServiceFromXML(xmlTemplate) @@ -632,7 +636,7 @@ class CloudeebusService: arguments: objectPath, xmlTemplate ''' agentObjectPath = list[0] - className = re.sub('/', '_', agentObjectPath[1:]) + className = createClassName(agentObjectPath) if (self.serviceAgents.has_key(className)): self.serviceAgents[self.className].remove_from_connection() -- 2.7.4