projects
/
contrib
/
cloudeebus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
34d13ef
)
Factorize creation of dynamic className (and ensure that's always the same)
author
Frederic PAUT
<frederic.paut@linux.intel.com>
Tue, 25 Jun 2013 08:55:09 +0000
(10:55 +0200)
committer
Frederic PAUT
<frederic.paut@linux.intel.com>
Tue, 25 Jun 2013 08:55:09 +0000
(10:55 +0200)
cloudeebus/cloudeebus.py
patch
|
blob
|
history
diff --git
a/cloudeebus/cloudeebus.py
b/cloudeebus/cloudeebus.py
index
49f857e
..
5a3eb4d
100755
(executable)
--- 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):
################################################################################
class DynDBusClass():
def __init__(self, className, globalCtx, localCtx):
@@
-613,7
+617,7
@@
class CloudeebusService:
'''
self.agentObjectPath = list[0]
xmlTemplate = list[1]
'''
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)
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]
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()
if (self.serviceAgents.has_key(className)):
self.serviceAgents[self.className].remove_from_connection()