Changeset 2523:febb88d5af75 in livinglogic.python.xist

Show
Ignore:
Timestamp:
05/23/06 17:53:29 (13 years ago)
Author:
Walter Doerwald <walter@…>
Branch:
default
Message:

Fix regression from the make update: There's no longer any maketarget.

Location:
src/ll/xist
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • src/ll/xist/converters.py

    r2520 r2523  
    159159            self.states[-1].makeaction = None 
    160160 
    161     class maketarget(misc.propclass): 
    162         """ 
    163         <par>If an &xist; conversion is done by an <pyref module="ll.make" class="XISTConvertAction"><class>XISTConvertAction</class></pyref> 
    164         this property will hold the <pyref module="ll.make" class="Target"><class>Target</class></pyref> object during that conversion. 
    165         If you're not using the <pyref module="ll.make"><module>make</module></pyref> module you can simply ignore this property. 
    166         The default is <lit>None</lit>.</par> 
    167         """ 
    168         def __get__(self): 
    169             return self.states[-1].maketarget 
    170      
    171         def __set__(self, maketarget): 
    172             self.states[-1].maketarget = maketarget 
    173      
    174         def __delete__(self): 
    175             self.states[-1].maketarget = None 
    176  
    177161    class makeproject(misc.propclass): 
    178162        """ 
     
    182166        """ 
    183167        def __get__(self): 
    184             maketarget = self.maketarget 
    185             if maketarget is None: 
    186                 return None 
    187             else: 
    188                 return maketarget.project 
    189  
    190     def push(self, node=None, root=None, mode=None, stage=None, target=None, lang=None, makeaction=None, maketarget=None): 
     168            return self.states[-1].makeproject 
     169     
     170        def __set__(self, makeproject): 
     171            self.states[-1].makeproject = makeproject 
     172     
     173        def __delete__(self): 
     174            self.states[-1].makeproject = None 
     175 
     176    def push(self, node=None, root=None, mode=None, stage=None, target=None, lang=None, makeaction=None, makeproject=None): 
    191177        self.lastnode = None 
    192178        if node is None: 
     
    204190        if makeaction is None: 
    205191            makeaction = self.makeaction 
    206         if maketarget is None: 
    207             maketarget = self.maketarget 
    208         self.states.append(ConverterState(node=node, root=root, mode=mode, stage=stage, target=target, lang=lang, makeaction=makeaction, maketarget=maketarget)) 
     192        if makeproject is None: 
     193            makeproject = self.makeproject 
     194        self.states.append(ConverterState(node=node, root=root, mode=mode, stage=stage, target=target, lang=lang, makeaction=makeaction, makeproject=makeproject)) 
    209195 
    210196    def pop(self): 
  • src/ll/xist/xsc.py

    r2520 r2523  
    869869        # Subclasses of Node implement this method by calling the appropriate present* method in the publisher (i.e. double dispatch) 
    870870 
    871     def conv(self, converter=None, root=None, mode=None, stage=None, target=None, lang=None, function=None, makeaction=None, maketarget=None): 
     871    def conv(self, converter=None, root=None, mode=None, stage=None, target=None, lang=None, function=None, makeaction=None, makeproject=None): 
    872872        """ 
    873873        <par>Convenience method for calling <pyref method="convert"><method>convert</method></pyref>.</par> 
     
    878878        """ 
    879879        if converter is None: 
    880             converter = converters.Converter(node=self, root=root, mode=mode, stage=stage, target=target, lang=lang, makeaction=makeaction, maketarget=maketarget) 
     880            converter = converters.Converter(node=self, root=root, mode=mode, stage=stage, target=target, lang=lang, makeaction=makeaction, makeproject=makeproject) 
    881881            return self.convert(converter) 
    882882        else: 
    883             converter.push(node=self, root=root, mode=mode, stage=stage, target=target, lang=lang, makeaction=makeaction, maketarget=maketarget) 
     883            converter.push(node=self, root=root, mode=mode, stage=stage, target=target, lang=lang, makeaction=makeaction, makeproject=makeproject) 
    884884            node = self.convert(converter) 
    885885            converter.pop()