edit the publish_subscribe.py

xingfeT · xingfeT · commit fee070271088 · 2014-09-06T20:26:35.000+08:00
diff --git a/composite.py b/composite.py
@@ -5,11 +5,10 @@
 A class which defines a composite object which can store
 hieararchical dictionaries with names.
 
-This class is same as a hiearchical dictionary, but it
-provides methods to add/access/modify children by name,
-like a Composite.
+This class is same as a hiearchical dictionary, but it provides methods
+to add/access/modify children by name, like a Composite.
 
-Created Anand B Pillai <abpillai@gmail.com>
+Created Anand B Pillai <abpillai@gmail.com>
 
 """
 __author__ = "Anand B Pillai"
@@ -18,8 +17,10 @@
 
 
 def normalize(val):
- """ Normalize a string so that it can be used as an attribute
- to a Python object """
+ """Normalize a string so that it can be used as an attribute to a Python
+
+ object
+ """
 
 if val.find('-') != -1:
 val = val.replace('-', '_')
@@ -38,8 +39,7 @@ def denormalize(val):
 
 class SpecialDict(dict):
 
- """ A dictionary type which allows direct attribute
- access to its keys """
+ """A dictionary type which allows direct attribute access to its keys """
 
 def __getattr__(self, name):
 
@@ -127,11 +127,13 @@ def isLeaf(self):
 return not self._children
 
 def getName(self):
+ 
 """ Return the name of this ConfigInfo object """
 
 return self._name
 
 def getIndex(self, child):
+ 
 """ Return the index of the child ConfigInfo object 'child' """
 
 if child in self._children:
@@ -145,29 +147,31 @@ def getDict(self):
 return self[self._name]
 
 def getProperty(self, child, key):
- """ Return the value for the property for child
- 'child' with key 'key' """
+ 
+ """Return the value for the property for child 'child' with key 'key' """
 
 # First get the child's dictionary
 childDict = self.getInfoDict(child)
 if childDict:
 return childDict.get(key, None)
 
- def setProperty(self, child, key, value):
- """ Set the value for the property 'key' for
- the child 'child' to 'value' """
+ def setProperty(self, child, key, value):
+ 
+ """Set the value for the property 'key' for the child 'child' to 'value' """
 
 # First get the child's dictionary
 childDict = self.getInfoDict(child)
 if childDict:
 childDict[key] = value
 
 def getChildren(self):
+ 
 """ Return the list of immediate children of this object """
 
 return self._children
 
 def getAllChildren(self):
+ 
 """ Return the list of all children of this object """
 
 l = []
@@ -178,13 +182,15 @@ def getAllChildren(self):
 return l
 
 def getChild(self, name):
+ 
 """ Return the immediate child object with the given name """
 
 for child in self._children:
 if child.getName() == name:
 return child
 
 def findChild(self, name):
+ 
 """ Return the child with the given name from the tree """
 
 # Note - this returns the first child of the given name
@@ -196,6 +202,7 @@ def findChild(self, name):
 return child
 
 def findChildren(self, name):
+ 
 """ Return a list of children with the given name from the tree """
 
 # Note: this returns a list of all the children of a given
@@ -210,6 +217,7 @@ def findChildren(self, name):
 return children
 
 def getPropertyDict(self):
+ 
 """ Return the property dictionary """
 
 d = self.getChild('__properties')
@@ -219,6 +227,7 @@ def getPropertyDict(self):
 return{}
 
 def getParent(self):
+ 
 """ Return the person who created me """
 
 return self._father
diff --git a/iterator.py b/iterator.py
diff --git a/publish_subscribe.py b/publish_subscribe.py
@@ -10,9 +10,8 @@
 class Provider:
 
 def __init__(self):
- self.msg_queue = []
- self.subscribers ={}
-
+ self.subscribe_queue ={}
+ self.msg_queue=[]
 def notify(self, msg):
 self.msg_queue.append(msg)
 
@@ -25,12 +24,14 @@ def subscribe(self, msg, subscriber):
 
 def unsubscribe(self, msg, subscriber):
 self.subscribers[msg].remove(subscriber)
+ if !self.subscribe[msg]:
+ del self.subscribe[msg]
 
 def update(self):
 for msg in self.msg_queue:
- if msg in self.subscribers:
- for sub in self.subscribers[msg]:
- sub.run(msg)
+ if msg in self.subscribers.keys():
+ for suber in self.subscribers[msg]:
+ suber.get(msg)
 self.msg_queue = []
 
 
@@ -52,7 +53,7 @@ def __init__(self, name, msg_center):
 def subscribe(self, msg):
 self.provider.subscribe(msg, self)
 
- def run(self, msg):
+ def get(self, msg):
 print("{} got{}".format(self.name, msg))
 
 

-Original file line number
+Diff line change
 A class which defines a composite object which can store
 hieararchical dictionaries with names.
 -This class is same as a hiearchical dictionary, but it
 -provides methods to add/access/modify children by name,
 -like a Composite.
 +This class is same as a hiearchical dictionary, but it provides methods
 +to add/access/modify children by name, like a Composite.
 -Created Anand B Pillai <[email protected]>
 +Created Anand B Pillai <[email protected]>
 """
 __author__="Anand B Pillai"
 defnormalize(val):
 -""" Normalize a string so that it can be used as an attribute
 - to a Python object """
 +"""Normalize a string so that it can be used as an attribute to a Python
++
 + object
 + """
 ifval.find('-') !=-1:
 val=val.replace('-', '_')
 classSpecialDict(dict):
 -""" A dictionary type which allows direct attribute
 - access to its keys """
 +"""A dictionary type which allows direct attribute access to its keys """
 def__getattr__(self, name):
 returnnotself._children
 defgetName(self):
++
 """ Return the name of this ConfigInfo object """
 returnself._name
 defgetIndex(self, child):
++
 """ Return the index of the child ConfigInfo object 'child' """
 ifchildinself._children:
 returnself[self._name]
 defgetProperty(self, child, key):
 -""" Return the value for the property for child
 - 'child' with key 'key' """
++
 +"""Return the value for the property for child 'child' with key 'key' """
 # First get the child's dictionary
 childDict=self.getInfoDict(child)
 ifchildDict:
 returnchildDict.get(key, None)
 -defsetProperty(self, child, key, value):
 -""" Set the value for the property 'key' for
 - the child 'child' to 'value' """
 +defsetProperty(self, child, key, value):
++
 +"""Set the value for the property 'key' for the child 'child' to 'value' """
 # First get the child's dictionary
 childDict=self.getInfoDict(child)
 ifchildDict:
 childDict[key] =value
 defgetChildren(self):
++
 """ Return the list of immediate children of this object """
 returnself._children
 defgetAllChildren(self):
++
 """ Return the list of all children of this object """
 l= []
 returnl
 defgetChild(self, name):
++
 """ Return the immediate child object with the given name """
 forchildinself._children:
 ifchild.getName() ==name:
 returnchild
 deffindChild(self, name):
++
 """ Return the child with the given name from the tree """
 # Note - this returns the first child of the given name
 returnchild
 deffindChildren(self, name):
++
 """ Return a list of children with the given name from the tree """
 # Note: this returns a list of all the children of a given
 returnchildren
 defgetPropertyDict(self):
++
 """ Return the property dictionary """
 d=self.getChild('__properties')
 return{}
 defgetParent(self):
++
 """ Return the person who created me """
 returnself._father
-Original file line number
+Diff line change
 classProvider:
 def__init__(self):
 -self.msg_queue= []
 -self.subscribers={}
+-
 +self.subscribe_queue={}
 +self.msg_queue=[]
 defnotify(self, msg):
 self.msg_queue.append(msg)
 defunsubscribe(self, msg, subscriber):
 self.subscribers[msg].remove(subscriber)
 +if !self.subscribe[msg]:
 +delself.subscribe[msg]
 defupdate(self):
 formsginself.msg_queue:
 -ifmsginself.subscribers:
 -forsubinself.subscribers[msg]:
 -sub.run(msg)
 +ifmsginself.subscribers.keys():
 +forsuberinself.subscribers[msg]:
 +suber.get(msg)
 self.msg_queue= []
 defsubscribe(self, msg):
 self.provider.subscribe(msg, self)
 -defrun(self, msg):
 +defget(self, msg):
 print("{} got{}".format(self.name, msg))