diff --git a/traits-stubs/traits-stubs/trait_types.pyi b/traits-stubs/traits-stubs/trait_types.pyi index 952a1a207..3a57b52ee 100644 --- a/traits-stubs/traits-stubs/trait_types.pyi +++ b/traits-stubs/traits-stubs/trait_types.pyi @@ -27,9 +27,6 @@ from uuid import UUID as _UUID from .trait_type import _TraitType SetTypes: _Any -int_fast_validate: _Any -float_fast_validate: _Any -complex_fast_validate: _Any bool_fast_validate: _Any diff --git a/traits/tests/test_trait_types.py b/traits/tests/test_trait_types.py index 1dc6cda2f..6ce0c00de 100644 --- a/traits/tests/test_trait_types.py +++ b/traits/tests/test_trait_types.py @@ -53,10 +53,10 @@ def test_numpy_validators_loaded_if_numpy_present(self): # If 'numpy' is available, the numpy validators should be loaded, # even if numpy is imported after traits. test_script = textwrap.dedent(""" - from traits.trait_types import float_fast_validate + from traits.trait_types import bool_fast_validate import numpy - if numpy.floating in float_fast_validate: + if numpy.bool_ in bool_fast_validate: print("Success") else: print("Failure") diff --git a/traits/trait_types.py b/traits/trait_types.py index 9b9e69f7f..b50ec05e2 100644 --- a/traits/trait_types.py +++ b/traits/trait_types.py @@ -95,35 +95,13 @@ try: # The numpy enhanced definitions: - from numpy import integer, floating, complexfloating, bool_ - - int_fast_validate = (ValidateTrait.coerce, int, integer) - float_fast_validate = ( - ValidateTrait.coerce, - float, - floating, - None, - int, - integer, - ) - complex_fast_validate = ( - ValidateTrait.coerce, - complex, - complexfloating, - None, - float, - floating, - int, - integer, - ) + from numpy import bool_ + bool_fast_validate = (ValidateTrait.coerce, bool, None, bool_) # Tuple or single type suitable for an isinstance check. _BOOL_TYPES = (bool, bool_) except ImportError: # The standard python definitions (without numpy): - int_fast_validate = (ValidateTrait.coerce, int) - float_fast_validate = (ValidateTrait.coerce, float, None, int) - complex_fast_validate = (ValidateTrait.coerce, complex, None, float, int) bool_fast_validate = (ValidateTrait.coerce, bool) # Tuple or single type suitable for an isinstance check. _BOOL_TYPES = bool