Changeset 4529:2af1ce09d6b7 in livinglogic.python.xist

Show
Ignore:
Timestamp:
07/28/11 16:58:54 (8 years ago)
Author:
Walter Doerwald <walter@…>
Branch:
default
Tags:
rel-3-23-1
Message:

Fix sisyphus: Use ul4c.Template instead of ul4c.compile.

Files:
4 modified

Legend:

Unmodified
Added
Removed
  • NEWS.rst

    r4524 r4529  
     1Changes in 3.23.1 (released 07/28/2011) 
     2--------------------------------------- 
     3 
     4*   Fixed a bug in :mod:`ll.sisyphus`: The code wasn't updated to use 
     5    :class:`ll.ul4c.Template` instead of :func:`ll.ul4c.compile`. 
     6 
     7 
    18Changes in 3.23 (released 07/20/2011) 
    29------------------------------------- 
  • setup.py

    r4524 r4529  
    228228args = dict( 
    229229    name="ll-xist", 
    230     version="3.23", 
     230    version="3.23.1", 
    231231    description="Extensible HTML/XML generator, cross-platform templating language, Oracle utilities and various other tools", 
    232232    long_description=description, 
  • src/ll/scripts/db2ul4.py

    r4453 r4529  
    198198            if os.path.extsep in templatename: 
    199199                templatename = templatename.rpartition(os.extsep)[0] 
    200         template = ul4c.compile(templatestream.read().decode(args.inputencoding)) 
     200        template = ul4c.Template(templatestream.read().decode(args.inputencoding), templatename) 
    201201        # The first template is the main template 
    202202        if maintemplate is None: 
  • src/ll/sisyphus.py

    r4497 r4529  
    335335            self.lineno = 1 # Current line number 
    336336            self.log = Tag(self._log) # Create tagged logger 
    337             self._formatlogline = ul4c.compile(self.formatlogline.replace("\n", "").replace("\r", "") + u"\n") # Log line formatting template 
     337            self._formatlogline = ul4c.Template(self.formatlogline.replace("\n", "").replace("\r", "") + u"\n", "formatlogline") # Log line formatting template 
    338338            self._createlog() # Create log file and link 
    339339 
     
    459459        if self.log2file: 
    460460            # Create the log file 
    461             logfilename = ul4c.compile(self.logfilename).renders(**self.info) 
     461            logfilename = ul4c.Template(self.logfilename, "logfilename").renders(**self.info) 
    462462            lf = self._logfilename = url.File(logfilename).abs() 
    463463            self._logfile = lf.openwrite() 
    464464            if self.loglinkname is not None: 
    465465                # Create the log link 
    466                 loglinkname = ul4c.compile(self.loglinkname).renders(**self.info) 
     466                loglinkname = ul4c.Template(self.loglinkname, "loglinkname").renders(**self.info) 
    467467                ll = self._loglinkname = url.File(loglinkname).abs() 
    468468                lf = self._logfilename