From 4bc4f0a16903eef80c3fda11d4263764b3f4cd72 Mon Sep 17 00:00:00 2001 From: "Gregory R. Lee" Date: Tue, 22 Dec 2015 20:22:47 -0500 Subject: [PATCH] remove try/except in _denoise_chambolle_nd. just use the numpy 1.6 compatible case --- skimage/restoration/_denoise.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/skimage/restoration/_denoise.py b/skimage/restoration/_denoise.py index 50eed95b..c4d64ee6 100644 --- a/skimage/restoration/_denoise.py +++ b/skimage/restoration/_denoise.py @@ -175,12 +175,7 @@ def _denoise_tv_chambolle_nd(im, weight=0.2, eps=2.e-4, n_iter_max=200): g[slices_g] = np.diff(out, axis=ax) slices_g[ax] = slice(None) - try: - norm = np.sqrt((g*g).sum(-1, keepdims=True)) - except: - # no keepdims argument available prior to numpy 1.7 - norm = np.sqrt((g*g).sum(-1))[..., np.newaxis] - + norm = np.sqrt((g*g).sum(-1))[..., np.newaxis] E += weight * norm.sum() norm *= 0.5 / weight norm += 1.