##// END OF EJS Templates
do not crash on illegal prompt strings (catch itpl exceptions)
vivainio -
Show More
@@ -2,7 +2,7 b''
2 """
2 """
3 Classes for handling input/output prompts.
3 Classes for handling input/output prompts.
4
4
5 $Id: Prompts.py 2899 2007-12-28 08:32:59Z fperez $"""
5 $Id: Prompts.py 2928 2008-01-10 14:30:51Z vivainio $"""
6
6
7 #*****************************************************************************
7 #*****************************************************************************
8 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
8 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
@@ -257,14 +257,19 b' class BasePrompt(object):'
257
257
258 import os,time # needed in locals for prompt string handling
258 import os,time # needed in locals for prompt string handling
259 loc = locals()
259 loc = locals()
260 self.p_str = ItplNS('%s%s%s' %
260 try:
261 ('${self.sep}${self.col_p}',
261 self.p_str = ItplNS('%s%s%s' %
262 multiple_replace(prompt_specials, self.p_template),
262 ('${self.sep}${self.col_p}',
263 '${self.col_norm}'),self.cache.user_ns,loc)
263 multiple_replace(prompt_specials, self.p_template),
264
264 '${self.col_norm}'),self.cache.user_ns,loc)
265 self.p_str_nocolor = ItplNS(multiple_replace(prompt_specials_nocolor,
265
266 self.p_template),
266 self.p_str_nocolor = ItplNS(multiple_replace(prompt_specials_nocolor,
267 self.cache.user_ns,loc)
267 self.p_template),
268 self.cache.user_ns,loc)
269 except:
270 print "Illegal prompt template (check $ usage!):",self.p_template
271 self.p_str = self.p_template
272 self.p_str_nocolor = self.p_template
268
273
269 def write(self,msg): # dbg
274 def write(self,msg): # dbg
270 sys.stdout.write(msg)
275 sys.stdout.write(msg)
@@ -1,3 +1,7 b''
1 2008-01-10 Ville Vainio <vivainio@gmail.com>
2
3 * Prompts.py (set_p_str): do not crash on illegal prompt strings
4
1 2008-01-08 Ville Vainio <vivainio@gmail.com>
5 2008-01-08 Ville Vainio <vivainio@gmail.com>
2
6
3 * '%macro -r' (raw mode) is now default in sh profile.
7 * '%macro -r' (raw mode) is now default in sh profile.
General Comments 0
You need to be logged in to leave comments. Login now