Changeset 400

Show
Ignore:
Timestamp:
01/13/03 14:59:12 (6 years ago)
Author:
sholloway
Message:

Integrated SubjectObserver? from old foundation into tree for meantime

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/RBJabber/RBJabber/Client.py

    r397 r400  
    2323 
    2424Dependencies: 
    25     Foundation.SubjectObserver 
     25    RBFoundation 
    2626    RBJabber 
    2727 
    …… 
    3737 
    3838from xml.sax.saxutils import escape, quoteattr 
    39 from RBJabber import ClientNodes 
    40 from RBJabber import JID 
    41 from RBJabber.JabberConnection import JabberConnection 
    42 from Foundation import SubjectObserver 
    4339from RBFoundation.XMLClassBuilder import ElementFactory as EF 
     40from JabberConnection import JabberConnection 
     41import ClientNodes 
     42import JID 
     43import SubjectObserver 
    4444 
    4545#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

  • trunk/RBJabber/RBJabber/Conference.py

    r253 r400  
    3434 
    3535import weakref 
    36 from Foundation.Jabber.JabberSubject import JabberSubjectBase 
    37 from Foundation.Jabber import JID 
    38 from Foundation.Jabber import JabberObserver as JObs 
    39 from Foundation.SubjectObserver.Observer import Observer 
    40 from Foundation.SubjectObserver.AttributedSubject import AttributedSubject 
     36import JID 
     37import JabberObserver as JObs 
     38from JabberSubject import JabberSubjectBase 
     39from SubjectObserver.Observer import Observer 
     40from SubjectObserver.AttributedSubject import AttributedSubject 
    4141 
    4242#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

  • trunk/RBJabber/RBJabber/JabberObserver.py

    r397 r400  
    150150def _Test_(): 
    151151    from RBFoundation.XMLObjectify import Objectify 
    152     from Foundation.SubjectObserver.BidableSubject import BidableSubject 
     152    from SubjectObserver.BidableSubject import BidableSubject 
    153153    def TestTrue(subject, obj): assert obj.__namespace__ == 'testing' and (obj.__node__ == 'tag' or (obj.myattr.find('haps') >= 0)) 
    154154    def TestFalse(subject, obj): assert 0 

  • trunk/RBJabber/RBJabber/JabberSubject.py

    r397 r400  
    2424#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    2525 
    26 from Foundation.SubjectObserver.CategorySubject import CategorySubjectBaseMixin 
    27 from Foundation.SubjectObserver import ProxyBidableCategorySubjectMixin 
     26from SubjectObserver.CategorySubject import CategorySubjectBaseMixin 
     27from SubjectObserver import ProxyBidableCategorySubjectMixin 
    2828from RBFoundation.WeakBind import BoundCallableBase 
    2929import JID 

  • trunk/RBJabber/RBJabber/PresenceMap.py

    r253 r400  
    2424#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    2525 
    26 from Foundation.SubjectObserver.Subject import Subject 
    27 from Foundation.SubjectObserver.Observer import Observer 
    28 from Foundation.SubjectObserver.BidableSubject import BidableSubject 
     26from SubjectObserver.Subject import Subject 
     27from SubjectObserver.Observer import Observer 
     28from SubjectObserver.BidableSubject import BidableSubject 
    2929from JabberSubject import FromJIDSubject 
    3030import JID 

  • trunk/RBJabber/RBJabber/SubjectObserver/AssociativeObserver.py

    r253 r400  
    3030#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    3131 
    32 from Foundation.WeakBind import BindCallable 
    33 from Foundation.SubjectObserver import ProxyBidableCategorySubjectMixin 
     32from RBFoundation.WeakBind import BindCallable 
     33import ProxyBidableCategorySubjectMixin 
    3434 
    3535#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

  • trunk/RBJabber/RBJabber/SubjectObserver/CategorySubject.py

    r253 r400  
    3030 
    3131from Subject import Subject 
    32 from Foundation import WeakBind 
     32from RBFoundation import WeakBind 
    3333import bisect 
    3434 

  • trunk/RBJabber/RBJabber/SubjectObserver/Observer.py

    r253 r400  
    3030#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    3131 
    32 from Foundation.WeakBind import BoundCallable, BindCallable 
     32from RBFoundation.WeakBind import BoundCallable, BindCallable 
    3333 
    3434#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

  • trunk/RBJabber/RBJabber/SubjectObserver/ProxySubject.py

    r253 r400  
    3232#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    3333 
    34 from Foundation import Acquisition 
     34from RBFoundation import Acquisition 
    3535import Subject 
    3636import CategorySubject 
    …… 
    111111if __name__=='__main__': 
    112112    print "Testing..." 
    113     from Foundation.AttributedDict import AttributedDict 
     113    from RBFoundation.AttributedDict import AttributedDict 
    114114    ad = AttributedDict({'a':1,'b':2}) 
    115115 

  • trunk/RBJabber/RBJabber/SubjectObserver/SchedulerSubject.py

    r253 r400  
    2727 
    2828import bisect, time 
    29 from Foundation import WeakBind 
     29from RBFoundation import WeakBind 
    3030 
    3131#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

  • trunk/RBJabber/RBJabber/SubjectObserver/StateMachine.py

    r253 r400  
    164164 
    165165def _Test_StateMachine(): 
    166     from Foundation.ContextApply import ContextApply_s_p,ContextApply_0 
     166    from RBFoundation.ContextApply import ContextApply_s_p,ContextApply_0 
    167167    def PrintDescription(State, precondition): 
    168168        print State.__doc__ 

  • trunk/RBJabber/RBJabber/SubjectObserver/Subject.py

    r282 r400  
    3232#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    3333 
    34 from Foundation import WeakBind 
     34from RBFoundation import WeakBind 
    3535import bisect 
    3636 

  • trunk/RBJabber/RBJabber/component.py

    r397 r400  
    2626from xml.sax.saxutils import escape, quoteattr 
    2727from RBFoundation.XMLObjectify import BaseObjectifiedXML  
    28 from RBJabber import JID 
    29 from RBJabber.JabberConnection import JabberConnection 
    30 from Foundation import SubjectObserver 
    3128from RBFoundation.XMLClassBuilder import ElementFactory as EF 
     29from JabberConnection import JabberConnection 
     30import JID 
     31import SubjectObserver 
    3232import sha  
    3333 

  • trunk/RBJabber/RBJabber/iqRosterQuery.py

    r397 r400  
    2727from xml.sax.saxutils import escape, quoteattr 
    2828from RBFoundation.WeakBind import BindCallable 
    29 from Foundation.SubjectObserver.CategorySubject import CategorySubject 
     29from SubjectObserver.CategorySubject import CategorySubject 
    3030from iqQuery import iqQueryBase 
    3131import JID