From 8142cfce8c56100c988b11c4a7edb018dead413f Mon Sep 17 00:00:00 2001 From: zyd Date: Sat, 16 Jul 2022 10:29:42 +0900 Subject: [PATCH] Replace isinstance with private functions --- ramda/map.py | 3 ++- ramda/private/_helper.py | 3 ++- ramda/private/_stepCat.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ramda/map.py b/ramda/map.py index 9d12e34..4a14cd0 100644 --- a/ramda/map.py +++ b/ramda/map.py @@ -6,6 +6,7 @@ from .private._dispatchable import _dispatchable from .private._has import _has from .private._inspect import funcArgsLength +from .private._isArrayLike import _isArrayLike from .private._isFunction import _isFunction from .private._map import _map from .private._reduce import _reduce @@ -29,7 +30,7 @@ def inner_reduce(acc, key): raise Exception('Can not work with None') if _isFunction(functor): return curryN(funcArgsLength(functor), lambda *arguments: fn(functor(*arguments))) - if isinstance(functor, (list, tuple)): + if _isArrayLike(functor): return _map(fn, functor) return _reduce(inner_reduce, {} if isinstance(functor, dict) or _has(functor, 'get') else copy.deepcopy(functor), keys(functor)) diff --git a/ramda/private/_helper.py b/ramda/private/_helper.py index ac7f488..005fe6e 100644 --- a/ramda/private/_helper.py +++ b/ramda/private/_helper.py @@ -4,6 +4,7 @@ from ._has import _has from ._isArrayLike import _isArrayLike from ._isInteger import _isInteger +from ._isNumber import _isNumber def toNumber(a): @@ -11,7 +12,7 @@ def toNumber(a): Convert any input a to a number type if can not convert, then return nan """ - if isinstance(a, (int, float)): + if _isNumber(a): return a try: return int(a) diff --git a/ramda/private/_stepCat.py b/ramda/private/_stepCat.py index 11065e4..1faa214 100644 --- a/ramda/private/_stepCat.py +++ b/ramda/private/_stepCat.py @@ -1,6 +1,7 @@ from ..objOf import objOf from ._identity import _identity from ._isArrayLike import _isArrayLike +from ._isString import _isString from ._isTransformer import _isTransformer @@ -33,7 +34,7 @@ def _stepCat(obj): return obj if _isArrayLike(obj): return _stepCatArray - if isinstance(obj, str): + if _isString(obj): return _stepCatString if isinstance(obj, dict): return _stepCatDict