##// END OF EJS Templates
bug in __doc__, flushing error message from RMagic's stdout cache
Jonathan Taylor -
Show More
@@ -140,6 +140,7 b' class RMagics(Magics):'
140 try:
140 try:
141 value = ri.baseenv['eval'](ri.parse(line))
141 value = ri.baseenv['eval'](ri.parse(line))
142 except (ri.RRuntimeError, ValueError) as exception:
142 except (ri.RRuntimeError, ValueError) as exception:
143 self.flush() # otherwise next return seems to have copy of error
143 raise RMagicError(unicode_to_str('parsing and evaluating line "%s". R traceback: "%s"\n' %
144 raise RMagicError(unicode_to_str('parsing and evaluating line "%s". R traceback: "%s"\n' %
144 (line, str_to_unicode(exception.message, 'utf-8'))))
145 (line, str_to_unicode(exception.message, 'utf-8'))))
145 text_output = self.flush()
146 text_output = self.flush()
@@ -551,7 +552,7 b' class RMagics(Magics):'
551 __doc__ = __doc__.format(
552 __doc__ = __doc__.format(
552 R_DOC = ' '*8 + RMagics.R.__doc__,
553 R_DOC = ' '*8 + RMagics.R.__doc__,
553 RPUSH_DOC = ' '*8 + RMagics.Rpush.__doc__,
554 RPUSH_DOC = ' '*8 + RMagics.Rpush.__doc__,
554 RPULL_DOC = ' '*8 + RMagics.Rpull.__doc__
555 RPULL_DOC = ' '*8 + RMagics.Rpull.__doc__,
555 RGET_DOC = ' '*8 + RMagics.Rget.__doc__
556 RGET_DOC = ' '*8 + RMagics.Rget.__doc__
556 )
557 )
557
558
General Comments 0
You need to be logged in to leave comments. Login now