diff options
Diffstat (limited to 'numpy')
-rw-r--r-- | numpy/core/numeric.py | 2 | ||||
-rw-r--r-- | numpy/core/numerictypes.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index 0d1b69ae9..166a2d5cc 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -354,7 +354,7 @@ def isscalar(num): if isinstance(num, generic): return True else: - return issctype(type(num)) + return type(num) in ScalarType _lkup = { '0':'0000', diff --git a/numpy/core/numerictypes.py b/numpy/core/numerictypes.py index ddb87294e..89d3a6d9d 100644 --- a/numpy/core/numerictypes.py +++ b/numpy/core/numerictypes.py @@ -346,7 +346,7 @@ def issctype(rep): return False try: res = obj2sctype(rep) - if res: + if res and res != object_: return True return False except: |