From 01a1e5e4b733b30633dc543cfa5f9785d9306560 Mon Sep 17 00:00:00 2001 From: Almar Klein Date: Tue, 26 Jul 2016 11:31:48 +0200 Subject: [PATCH] MC: small tweaks from reviewer comments --- skimage/measure/_marching_cubes_classic.py | 2 +- skimage/measure/_marching_cubes_lewiner.py | 4 ++-- skimage/measure/tests/test_marching_cubes.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/skimage/measure/_marching_cubes_classic.py b/skimage/measure/_marching_cubes_classic.py index b6e77c5d..2cd936a2 100644 --- a/skimage/measure/_marching_cubes_classic.py +++ b/skimage/measure/_marching_cubes_classic.py @@ -255,7 +255,7 @@ def correct_mesh_orientation(volume, verts, faces, spacing=(1., 1., 1.), """ warn(DeprecationWarning("`correct_mesh_orientation` is deprecated for " - "removal as `marching_cubes`_classic now " + "removal as `marching_cubes_classic` now " "guarantees correct mesh orientation.")) verts = verts.copy() diff --git a/skimage/measure/_marching_cubes_lewiner.py b/skimage/measure/_marching_cubes_lewiner.py index 067396db..66764ebc 100644 --- a/skimage/measure/_marching_cubes_lewiner.py +++ b/skimage/measure/_marching_cubes_lewiner.py @@ -17,7 +17,7 @@ from . import _marching_cubes_lewiner_cy from .._shared.utils import skimage_deprecation, warn -def expected_output_args(): +def _expected_output_args(): """ Get number of expected output args. Please don't use this to influence the algorithmic bahaviour of a function. @@ -129,7 +129,7 @@ def marching_cubes(volume, level=None, spacing=(1., 1., 1.), # This signature (output args) of this func changed after 0.12 try: - nout = expected_output_args() + nout = _expected_output_args() except Exception: nout = 0 if nout <= 2: diff --git a/skimage/measure/tests/test_marching_cubes.py b/skimage/measure/tests/test_marching_cubes.py index 3fa85da3..a9d59a21 100644 --- a/skimage/measure/tests/test_marching_cubes.py +++ b/skimage/measure/tests/test_marching_cubes.py @@ -6,7 +6,7 @@ from skimage.draw import ellipsoid, ellipsoid_stats from skimage.measure import (marching_cubes, marching_cubes_classic, marching_cubes_lewiner, mesh_surface_area, correct_mesh_orientation) -from skimage.measure._marching_cubes_lewiner import expected_output_args +from skimage.measure._marching_cubes_lewiner import _expected_output_args def test_expected_output_args(): @@ -14,7 +14,7 @@ def test_expected_output_args(): res = [] def foo(): - nout = expected_output_args() + nout = _expected_output_args() print(nout) res.append(nout) return [nout] * int(nout)