From 311cf8fc15d2762564e972b723cc360670c1b41c 2007-04-20 17:18:43
From: vivainio
Date: 2007-04-20 17:18:43
Subject: [PATCH] switch ipy_render.py to use Itpl notation
---

diff --git a/IPython/Extensions/ipy_render.py b/IPython/Extensions/ipy_render.py
index 2227076..4d73069 100644
--- a/IPython/Extensions/ipy_render.py
+++ b/IPython/Extensions/ipy_render.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 
+""" IPython extension: Render templates from variables and paste to clipbard """
+
 import IPython.ipapi
 
 ip = IPython.ipapi.get()
@@ -7,8 +9,10 @@ ip = IPython.ipapi.get()
 from string import Template
 import sys
 
+from IPython.Itpl import itplns
+
 def toclip_w32(s):
-    """ places contents of s to clipboard
+    """ Places contents of s to clipboard
     
     Needs pyvin32 to work:
     http://sourceforge.net/projects/pywin32/
@@ -28,7 +32,7 @@ except ImportError:
     
 
 def render(tmpl):
-    """ Render a template (as specified in string.Template docs) from ipython variables
+    """ Render a template (Itpl format) from ipython variables
 
     Example:
     
@@ -38,11 +42,19 @@ def render(tmpl):
     $ render t_submission_form
     
     => returns "Submission report, author: Bob" and copies to clipboard on win32
+
+    Template examples (Ka-Ping Yee's Itpl library):
     
+    Here is a $string.
+    Here is a $module.member.
+    Here is an $object.member.
+    Here is a $functioncall(with, arguments).
+    Here is an ${arbitrary + expression}.
+    Here is an $array[3] member.
+    Here is a $dictionary['member'].
     """
     
-    s = Template(tmpl)
-    res = s.substitute(ip.user_ns)
+    res = itplns(tmpl, ip.user_ns)
     toclip(res)
     return res
 
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 31f1723..3a4222d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,8 +1,8 @@
 2007-04-20  Ville Vainio  <vivainio@gmail.com>
 
 	* Extensions/ipy_render.py: added extension for easy
-	interactive text template rendering (todo - add a better
-	renderer than string.Template)
+	interactive text template rendering (to clipboard). Uses Ka-Ping Yee's
+	'Iptl' template notation, 
 	
 	* Extensions/ipy_completers.py: introduced Olivier Lauzanne's
 	safer & faster 'import' completer.