Changeset 528 for trunk/RBJabber
- Timestamp:
- 04/25/03 00:08:31 (5 years ago)
- Files:
-
- trunk/RBJabber/RBJabber/JabberConnection.py (modified) (1 diff)
- trunk/RBJabber/RBJabber/JabberObserver.py (modified) (1 diff)
- trunk/RBJabber/RBJabber/JabberSubject.py (modified) (1 diff)
- trunk/RBJabber/RBJabber/SubjectObserver/AssociativeObserver.py (modified) (1 diff)
- trunk/RBJabber/RBJabber/SubjectObserver/CategorySubject.py (modified) (2 diffs)
- trunk/RBJabber/RBJabber/SubjectObserver/Observer.py (modified) (1 diff)
- trunk/RBJabber/RBJabber/SubjectObserver/SchedulerSubject.py (modified) (3 diffs)
- trunk/RBJabber/RBJabber/SubjectObserver/Subject.py (modified) (4 diffs)
- trunk/RBJabber/RBJabber/iqAuthQuery.py (modified) (1 diff)
- trunk/RBJabber/RBJabber/iqQuery.py (modified) (1 diff)
- trunk/RBJabber/RBJabber/iqResponse.py (modified) (1 diff)
- trunk/RBJabber/RBJabber/iqRosterQuery.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/RBJabber/RBJabber/JabberConnection.py
r397 r528 40 40 from RBFoundation.XMLClassBuilder import XMLClassBuilderMixin 41 41 from RBFoundation import SmartSelect 42 from RBFoundation. WeakBindimport BindCallable42 from RBFoundation.BindCallable import BindCallable 43 43 import JID 44 44 import sys trunk/RBJabber/RBJabber/JabberObserver.py
r400 r528 24 24 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 25 25 26 from RBFoundation. WeakBindimport BoundCallable, BindCallable26 from RBFoundation.BindCallable import BoundCallable, BindCallable 27 27 import JID 28 28 trunk/RBJabber/RBJabber/JabberSubject.py
r400 r528 26 26 from SubjectObserver.CategorySubject import CategorySubjectBaseMixin 27 27 from SubjectObserver import ProxyBidableCategorySubjectMixin 28 from RBFoundation. WeakBindimport BoundCallableBase28 from RBFoundation.BindCallable import BoundCallableBase 29 29 import JID 30 30 trunk/RBJabber/RBJabber/SubjectObserver/AssociativeObserver.py
r400 r528 30 30 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 31 31 32 from RBFoundation. WeakBindimport BindCallable32 from RBFoundation.BindCallable import BindCallable 33 33 import ProxyBidableCategorySubjectMixin 34 34 trunk/RBJabber/RBJabber/SubjectObserver/CategorySubject.py
r400 r528 30 30 31 31 from Subject import Subject 32 from RBFoundation import WeakBind32 from RBFoundation import BindCallable 33 33 import bisect 34 34 … … 47 47 48 48 def AddObserver(self, category, observer, priority=0): 49 result = WeakBind.BindCallable(observer)49 result = BindCallable.BindCallable(observer) 50 50 bisect.insort(self._observers.setdefault(category,[]), (-priority, result)) 51 51 return self 52 52 53 53 def RemoveObserver(self, observer): 54 result = WeakBind.BindCallable(observer)54 result = BindCallable.BindCallable(observer) 55 55 for observers in self._observers.itervalues(): 56 56 observers[:] = [x for x in observers if x[-1] != result] trunk/RBJabber/RBJabber/SubjectObserver/Observer.py
r400 r528 30 30 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 31 31 32 from RBFoundation. WeakBindimport BoundCallable, BindCallable32 from RBFoundation.BindCallable import BoundCallable, BindCallable 33 33 34 34 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ trunk/RBJabber/RBJabber/SubjectObserver/SchedulerSubject.py
r400 r528 27 27 28 28 import bisect, time 29 from RBFoundation import WeakBind29 from RBFoundation import BindCallable 30 30 31 31 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ … … 35 35 class SchedulerSubject(object): 36 36 def __init__(self, TimeFn=time.time): 37 self._TimeFn = WeakBind.BindCallable(TimeFn)37 self._TimeFn = BindCallable.BindCallable(TimeFn) 38 38 self._LastTime = 0 39 39 self._events = [] … … 47 47 48 48 def AddEvent(self, Time, observer): 49 result = Time, WeakBind.BindCallable(observer)49 result = Time, BindCallable.BindCallable(observer) 50 50 bisect.insort(self._events, result) 51 51 return self 52 52 53 53 def RemoveEvent(self, observer): 54 result = WeakBind.BindCallable(observer)54 result = BindCallable.BindCallable(observer) 55 55 self._events[:] = [x for x in self._events if x[-1] != result] 56 56 return self trunk/RBJabber/RBJabber/SubjectObserver/Subject.py
r400 r528 25 25 no longer exisits or is explicitly released. 26 26 27 WeakBindmodule is used extensively to prevent reference chains keeping objects in27 BindCallable module is used extensively to prevent reference chains keeping objects in 28 28 memory unnecessarily.""" 29 29 … … 32 32 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 33 33 34 from RBFoundation import WeakBind34 from RBFoundation import BindCallable 35 35 import bisect 36 36 … … 56 56 """Adds observer to the internal collection monitoring this subject 57 57 Observer is assumed to be a callable object.""" 58 result = WeakBind.BindCallable(observer)58 result = BindCallable.BindCallable(observer) 59 59 bisect.insort(self._observers, (-priority, result)) 60 60 return self … … 63 63 """Removes observer from the internal collection monitoring this subject. 64 64 Observer should be the same object that was passed to AddObserver.""" 65 result = WeakBind.BindCallable(observer)65 result = BindCallable.BindCallable(observer) 66 66 self._observers[:] = [x for x in self._observers if x[-1] != result] 67 67 return self trunk/RBJabber/RBJabber/iqAuthQuery.py
r397 r528 26 26 import weakref, sha 27 27 from xml.sax.saxutils import escape, quoteattr 28 from RBFoundation. WeakBindimport BindCallable28 from RBFoundation.BindCallable import BindCallable 29 29 from iqQuery import iqQueryBase 30 30 trunk/RBJabber/RBJabber/iqQuery.py
r397 r528 26 26 import weakref 27 27 from xml.sax.saxutils import escape, quoteattr 28 from RBFoundation. WeakBindimport BindCallable28 from RBFoundation.BindCallable import BindCallable 29 29 import JabberObserver as JObs 30 30 import JID trunk/RBJabber/RBJabber/iqResponse.py
r397 r528 28 28 import weakref 29 29 from xml.sax.saxutils import escape, quoteattr 30 from RBFoundation. WeakBindimport BindCallable30 from RBFoundation.BindCallable import BindCallable 31 31 import JabberObserver as JObs 32 32 import JID trunk/RBJabber/RBJabber/iqRosterQuery.py
r400 r528 26 26 import weakref 27 27 from xml.sax.saxutils import escape, quoteattr 28 from RBFoundation. WeakBindimport BindCallable28 from RBFoundation.BindCallable import BindCallable 29 29 from SubjectObserver.CategorySubject import CategorySubject 30 30 from iqQuery import iqQueryBase
