RFCT Simplify checking for correct mode usage

luispedro · Aug 13, 2014 · 222bc27 · 222bc27
1 parent d6730bc
commit 222bc27
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/mahotas/_filters.py b/mahotas/_filters.py
@@ -16,8 +16,12 @@
 
 modes = frozenset(mode2int.keys())
 
-def _check_mode(mode, cval, fname):
+def _checked_mode2int(mode, cval, fname):
     if mode not in modes:
         raise ValueError('mahotas.%s: `mode` not in %s' % (fname, modes))
     if mode == 'constant' and cval != 0.:
         raise NotImplementedError('Please email mahotas developers to get this implemented.')
+    return mode2int[mode]
+
+_check_mode = _checked_mode2int
+
diff --git a/mahotas/labeled.py b/mahotas/labeled.py
@@ -8,7 +8,7 @@
 from .morph import get_structuring_elem
 from . import _labeled
 from .internal import _get_output
-from ._filters import mode2int, modes, _check_mode
+from ._filters import _checked_mode2int
 import mahotas as mh
 
 __all__ = [
@@ -317,7 +317,7 @@ def borders(labeled, Bc=None, out=None, output=None, mode='constant'):
     Bc = get_structuring_elem(labeled, Bc)
     output = _get_output(labeled, out, 'labeled.borders', bool, output=output)
     output.fill(False)
-    return _labeled.borders(labeled, Bc, output, mode2int[mode])
+    return _labeled.borders(labeled, Bc, output, _checked_mode2int(mode, 0.0, 'borders'))
 
 
 def bwperim(bw, n=4, mode="constant"):