Changeset 11

Show
Ignore:
Timestamp:
Mon Sep 5 13:21:59 2005
Author:
rdelon
Message:

Renamed unittest into test

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/cherrytemplate.py

    r9 r11  
    28 28 class ParseError(Exception): pass  
    29 29 class InternalError(Exception): pass  
      30 class FileNotFoundError(Exception): pass  
    30 31  
    31 32 def _findClosingQuote(str, quote, startIndex, beforeNewline=1):  
    …… 
    108 109  
    109 110 def _getTemplateFile(filename, templateDir):  
    110       if not os.path.isabs(filename) and templateDir:  
    111           filename = os.path.join(templateDir, filename)  
    112       return open(filename, 'rb').read()  
      111     if os.path.isabs(filename):  
      112         return open(filename, 'rb').read()  
      113     if not (isinstance(templateDir, list)):  
      114         templateDir = [templateDir]  
      115     for dir in templateDir:  
      116         newfilename = os.path.join(dir, filename)  
      117         if os.path.exists(newfilename):  
      118             return open(newfilename, 'rb').read()  
      119     raise FileNotFoundError(filename, templateDir)  
      120      
      121      
    113 122  
    114 123 def _expandPyInclude(template, templateDir, loop=0):  
    …… 
    445 454         raise InternalError(minTag)  
    446 455  
    447   def renderTemplate(template = '', file = None, inputEncoding = None, outputEncoding = None, outputEncodingErrors = None, returnGenerator = None, glob = None, loc = None):  
      456 def render(template = '', file = None, inputEncoding = None, outputEncoding = None, outputEncodingErrors = None, returnGenerator = None, glob = None, loc = None):  
    447 456     # print "* Rendering:", file  
    448 457     originalTemplate = template  
    …… 
    504 513         raise RenderError, '\n'.join(errorList)  
    505 514  
      515 renderTemplate = render # legacy API  
      516  
    506 517 def _resultAsGenerator(result, inputEncoding, outputEncoding, outputEncodingErrors):  
    507 518         for line in result: