RF: Switch to locally-defined underscore function

Remove externals/inflection

_underscore taken from inflection 0.3.1
https://github.com/jpvanhal/inflection/blob/663982e/inflection.py

Tests modified from:
https://github.com/jpvanhal/inflection/blob/663982e/test_inflection.py#L352-L357

Author: effigies

nibabel/cifti2/cifti2.py

@@ -19,10 +19,10 @@
 '''
 from __future__ import division, print_function, absolute_import
 
+import re
 import numpy as np
 
 from .. import xmlutils as xml
-from ..externals import inflection
 from ..externals.six import string_types
 from ..externals.six.moves import reduce
 from ..filebasedimages import FileBasedHeader, FileBasedImage
@@ -93,6 +93,12 @@ def _value_or_make_klass(val, klass):
         return _value_if_klass(val, klass)
 
 
+def _underscore(string):
+    """ Convert a string from camelcase to underscored """
+    string = re.sub(r'([A-Z]+)([A-Z][a-z])', r'\1_\2', string)
+    return re.sub(r'([a-z0-9])([A-Z])', r'\1_\2', string).lower()
+
+
 class Cifti2MetaData(xml.XmlSerializable):
     """ A list of key-value pairs stored in the list self.data """
 
@@ -466,7 +472,7 @@ def _to_xml_element(self):
 
         for key in ['IndexOffset', 'IndexCount', 'ModelType', 'BrainStructure',
                     'SurfaceNumberOfVertices']:
-            attr = inflection.underscore(key)
+            attr = _underscore(key)
             value = getattr(self, attr)
             if value is not None:
                 brain_model.attrib[key] = str(value)
@@ -598,7 +604,7 @@ def _to_xml_element(self):
         mat_ind_map.attrib['AppliesToMatrixDimension'] = ','.join(dims_as_strings)
         for key in ['IndicesMapToDataType', 'NumberOfSeriesPoints', 'SeriesExponent',
                     'SeriesStart', 'SeriesStep', 'SeriesUnit']:
-            attr = inflection.underscore(key)
+            attr = _underscore(key)
             value = getattr(self, attr)
             if value is not None:
                 mat_ind_map.attrib[key] = str(value)

nibabel/cifti2/parse_cifti2_fast.py

@@ -18,9 +18,8 @@
                      Cifti2MatrixIndicesMap, Cifti2NamedMap, Cifti2Parcel,
                      Cifti2Surface, Cifti2TransformationMatrixVoxelIndicesIJKtoXYZ,
                      Cifti2Vertices, Cifti2Volume, CIFTI_BrainStructures,
-                     CIFTI_MODEL_TYPES)
+                     CIFTI_MODEL_TYPES, _underscore)
 from .. import xmlutils as xml
-from ..externals import inflection
 from ..externals.six import BytesIO
 from ..externals.six.moves import reduce
 from ..nifti1 import Nifti1Extension, extension_codes, intent_codes
@@ -182,8 +181,7 @@ def StartElementHandler(self, name, attrs):
                                ("SeriesStep", float),
                                ("SeriesUnit", str)]:
                 if key in attrs:
-                    attr = inflection.underscore(key)
-                    setattr(mim, attr, dtype(attrs[key]))
+                    setattr(mim, _underscore(key), dtype(attrs[key]))
             matrix = self.struct_state[-1]
             assert isinstance(matrix, Cifti2Matrix)
             matrix.add_cifti_matrix_indices_map(mim)
@@ -296,8 +294,7 @@ def StartElementHandler(self, name, attrs):
                                ("BrainStructure", str),
                                ("SurfaceNumberOfVertices", int)]:
                 if key in attrs:
-                    attr = inflection.underscore(key)
-                    setattr(model, attr, dtype(attrs[key]))
+                    setattr(model, _underscore(key), dtype(attrs[key]))
             assert model.brain_structure in CIFTI_BrainStructures
             assert model.model_type in CIFTI_MODEL_TYPES
             mim.add_cifti_brain_model(model)

nibabel/cifti2/tests/test_cifti2.py

@@ -40,3 +40,20 @@ def test_cifti2_metadata():
     md.remove_metadata(['b', 'bval'])
     assert_equal(len(md.data), 0)
     assert_equal(md.to_xml().decode('utf-8'), '<MetaData />')
+
+
+def test_underscoring():
+    # Pairs taken from inflection tests
+    # https://github.com/jpvanhal/inflection/blob/663982e/test_inflection.py#L113-L125
+    pairs = (("Product", "product"),
+             ("SpecialGuest", "special_guest"),
+             ("ApplicationController", "application_controller"),
+             ("Area51Controller", "area51_controller"),
+             ("HTMLTidy", "html_tidy"),
+             ("HTMLTidyGenerator", "html_tidy_generator"),
+             ("FreeBSD", "free_bsd"),
+             ("HTML", "html"),
+            )
+
+    for camel, underscored in pairs:
+        assert_equal(ci.cifti2._underscore(camel), underscored)