Changeset 6

Show
Ignore:
Timestamp:
Wed May 11 03:20:18 2005
Author:
rdelon
Message:
Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/cherrytemplate/cherrytemplate.py

    r5 r6  
    443 443  
    444 444 def renderTemplate(template = '', file = None, inputEncoding = None, outputEncoding = None, outputEncodingErrors = None, returnGenerator = None, glob = None, loc = None):  
    445       print "* Rendering:", file  
      445     #print "* Rendering:", file  
    445 445     if loc is None:  
    446 446         loc = inspect.currentframe(1).f_locals  
    …… 
    457 457     _writeTemplate(f, template, '    ')  
    458 458     template = f.getvalue()  
    459       print "*** template:", template  
    460       print "*** END TEMPLATE"  
      459     #print "*** template:", template  
      460     #print "*** END TEMPLATE"  
    461 461      
    462 462     g = glob.copy() # make a copy because we don't want to avoid changing original global scope.  

  • trunk/cherrytemplate/unittest/unittest.py

    r4 r6  
    46 46 europoundLatin1 = europoundUnicode.encode('latin-1')  
    47 47 res = cherrytemplate.renderTemplate(europoundLatin1 + """<py-eval="europoundLatin1">""")  
    48   print "Testing latin-1 template, latin-1 output (1bis)...",  
    49 48 checkRes(res, europoundLatin1*2)  
      49 print "Testing latin-1 template, latin-1 output (1bis)...",  
    50 50 res = cherrytemplate.renderTemplate(europoundLatin1 + """<%= europoundLatin1%>""")  
    51 51 checkRes(res, europoundLatin1*2)