From d7986d11aaf8800ad1e21cf942a96cb42d1205d7 Mon Sep 17 00:00:00 2001 From: Theo Steininger Date: Tue, 30 May 2017 23:29:47 +0200 Subject: [PATCH] Removed pretty_str from test_common.py. --- test/common.py | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/test/common.py b/test/common.py index 797ed806..4aeb1264 100644 --- a/test/common.py +++ b/test/common.py @@ -16,47 +16,15 @@ # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik # and financially supported by the Studienstiftung des deutschen Volkes. -import d2o -import numpy as np from nose_parameterized import parameterized from nifty import RGSpace, LMSpace, HPSpace, GLSpace, PowerSpace from nifty.config import dependency_injector as di -from string import strip - - -def pretty_str(obj): - if type(obj) == list: - return " ".join(pretty_str(x) for x in obj) - if type(obj) == tuple: - return " ".join(pretty_str(x) for x in obj) - if type(obj) == RGSpace: - return type(obj).__name__ - elif type(obj) == LMSpace: - return type(obj).__name__ - elif type(obj) == HPSpace: - return type(obj).__name__ - elif type(obj) == GLSpace: - return type(obj).__name__ - elif type(obj) == PowerSpace: - return type(obj).__name__ - elif isinstance(obj, d2o.distributed_data_object): - return 'd2o' - elif type(obj) == dict: - if 'error' in obj: - return 'error_' + obj['error'].__name__ - else: - return '' - elif type(obj) == np.ndarray: - return 'DATA' - else: - return str(obj) def custom_name_func(testcase_func, param_num, param): return "%s_%s" % ( testcase_func.__name__, - strip(parameterized.to_safe_name( - " ".join(pretty_str(x) for x in param.args)), '_') + parameterized.to_safe_name("_".join(str(x) for x in param.args)), ) -- GitLab