Changeset 537

Show
Ignore:
Timestamp:
05/15/03 13:12:41 (6 years ago)
Author:
sholloway
Message:

Using both Event and Basic at the same time without the sets module present cause import errors. Go Figure.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/RBFoundation/RBFoundation/SubObs/Basic.py

    r286 r537  
    3838#~ Simple Lists ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    3939 
    40 try: 
    41     from LogicRules import ListCollection 
    42     class SubjectWeakList(SimpleSubjectBase, ListCollection.ListCollection, BaseCollection.WeakWrapCallableMixin): pass 
    43     class SubjectStrongList(SimpleSubjectBase, ListCollection.ListCollection, BaseCollection.StrongWrapCallableMixin): pass 
    44     SubjectList = SubjectWeakList 
    45     Subject = SubjectWeakList # Set default 
    46 except ImportError:  
    47     pass 
     40from LogicRules import ListCollection 
     41 
     42class SubjectWeakList(SimpleSubjectBase, ListCollection.ListCollection, BaseCollection.WeakWrapCallableMixin): pass 
     43class SubjectStrongList(SimpleSubjectBase, ListCollection.ListCollection, BaseCollection.StrongWrapCallableMixin): pass 
     44SubjectList = SubjectWeakList 
     45Subject = SubjectWeakList # Set default 
    4846 
    4947#~ Sets if they exist ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    5048 
    51 try: 
    52     from LogicRules import SetCollection 
    53     class SubjectWeakSet(SimpleSubjectBase, SetCollection.SetCollection, BaseCollection.WeakWrapCallableMixin): pass 
    54     class SubjectStrongSet(SimpleSubjectBase, SetCollection.SetCollection, BaseCollection.StrongWrapCallableMixin): pass 
    55     SubjectSet = SubjectWeakSet 
    56 except ImportError:  
    57     pass 
     49from LogicRules import SetCollection 
     50 
     51class SubjectWeakSet(SimpleSubjectBase, SetCollection.SetCollection, BaseCollection.WeakWrapCallableMixin): pass 
     52class SubjectStrongSet(SimpleSubjectBase, SetCollection.SetCollection, BaseCollection.StrongWrapCallableMixin): pass 
     53SubjectSet = SubjectWeakSet 
    5854 
    5955#~ Ordered Lists ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    6056 
    61 try: 
    62     from LogicRules import OrderedListCollection 
    63     class SubjectWeakOrderedList(SimpleSubjectBase, OrderedListCollection.OrderedListCollection, BaseCollection.WeakWrapCallableMixin): pass 
    64     class SubjectStrongOrderedList(SimpleSubjectBase, OrderedListCollection.OrderedListCollection, BaseCollection.StrongWrapCallableMixin): pass 
    65     SubjectOrderedList = SubjectWeakOrderedList 
    66 except ImportError:  
    67     pass 
     57from LogicRules import OrderedListCollection 
     58 
     59class SubjectWeakOrderedList(SimpleSubjectBase, OrderedListCollection.OrderedListCollection, BaseCollection.WeakWrapCallableMixin): pass 
     60class SubjectStrongOrderedList(SimpleSubjectBase, OrderedListCollection.OrderedListCollection, BaseCollection.StrongWrapCallableMixin): pass 
     61SubjectOrderedList = SubjectWeakOrderedList 
    6862 
    6963#~ Dictonaries ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    7064 
    71 try: 
    72     from LogicRules import DictCollection 
     65from LogicRules import DictCollection 
    7366 
    74     class SubjectWeakCallableDict(SimpleSubjectBase, DictCollection.CallableDictCollection, BaseCollection.WeakWrapCallableMixin): pass 
    75     class SubjectStrongCallableDict(SimpleSubjectBase, DictCollection.CallableDictCollection, BaseCollection.StrongWrapCallableMixin): pass 
    76     SubjectCallableDict = SubjectWeakCallableDict 
     67class SubjectWeakCallableDict(SimpleSubjectBase, DictCollection.CallableDictCollection, BaseCollection.WeakWrapCallableMixin): pass 
     68class SubjectStrongCallableDict(SimpleSubjectBase, DictCollection.CallableDictCollection, BaseCollection.StrongWrapCallableMixin): pass 
     69SubjectCallableDict = SubjectWeakCallableDict 
    7770 
    78     class SubjectWeakDataDict(SimpleSubjectBase, DictCollection.DataDictCollection, BaseCollection.WeakWrapCallableMixin): pass 
    79     class SubjectStrongDataDict(SimpleSubjectBase, DictCollection.DataDictCollection, BaseCollection.StrongWrapCallableMixin): pass 
    80     SubjectDataDict = SubjectWeakDataDict 
    81 except ImportError:  
    82     pass 
     71class SubjectWeakDataDict(SimpleSubjectBase, DictCollection.DataDictCollection, BaseCollection.WeakWrapCallableMixin): pass 
     72class SubjectStrongDataDict(SimpleSubjectBase, DictCollection.DataDictCollection, BaseCollection.StrongWrapCallableMixin): pass 
     73SubjectDataDict = SubjectWeakDataDict 
    8374 

  • trunk/RBFoundation/RBFoundation/SubObs/LogicRules/SetCollection.py

    r286 r537  
    2525 
    2626from __future__ import generators 
    27 import sets 
    2827from BaseCollection import * 
     28 
     29try: 
     30    from sets import Set 
     31except: 
     32    Set = NotImplementedError 
    2933 
    3034#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    …… 
    3741    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    3842 
    39     _collection_class = sets.Set 
     43    _collection_class = Set 
    4044 
    4145    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~