From 669ca82ce1979b561c190d3a5ea958999e6d5fc6 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 28 May 2019 09:02:29 +0200 Subject: [PATCH] formatted return message also on interactive shells --- python/damask/geom.py | 2 +- python/damask/util.py | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/python/damask/geom.py b/python/damask/geom.py index 49dbacff8..4428a2f6b 100644 --- a/python/damask/geom.py +++ b/python/damask/geom.py @@ -70,7 +70,7 @@ class Geom(): message[-1] = util.delete(message[-1]) message.append('max microstructure: {}'.format(np.nanmax(self.microstructure))) - return util.srepr(message) + return util.return_message(message) def set_comments(self,comments): self.comments = [] diff --git a/python/damask/util.py b/python/damask/util.py index d11b74a7b..7e7bae3bc 100644 --- a/python/damask/util.py +++ b/python/damask/util.py @@ -189,6 +189,17 @@ def progressBar(iteration, total, prefix='', bar_length=50): if iteration == total: sys.stderr.write('\n') sys.stderr.flush() + + +class return_message(): + """Object with formatted return message""" + + def __init__(self,message): + self.message = message + + def __repr__(self): + """Return message suitable for interactive shells""" + return srepr(self.message) def leastsqBound(func, x0, args=(), bounds=None, Dfun=None, full_output=0,