Skip to content

Commit 87d83ca

Browse files
committed
fixed
1 parent 45865d3 commit 87d83ca

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

pandas/_libs/lib.pyx

+1-2
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ def is_scalar(val: object) -> bint:
159159

160160
return (cnp.PyArray_IsAnyScalar(val)
161161
# As of numpy-1.9, PyArray_IsAnyScalar misses bytearrays on Py3.
162-
or isinstance(val,(bytes, Number, Fraction))
162+
or isinstance(val,(bytes,Fraction,Number))
163163
# We differ from numpy (as of 1.10), which claims that None is
164164
# not scalar in np.isscalar().
165165
or val is None
@@ -170,7 +170,6 @@ def is_scalar(val: object) -> bint:
170170
or is_decimal(val)
171171
or is_interval(val)
172172
or util.is_offset_object(val))
173-
174173
def item_from_zerodim(val: object) -> object:
175174
"""
176175
If the value is a zerodim array, return the item it contains.

pandas/tests/dtypes/test_inference.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
import re
1111
from datetime import datetime, date, timedelta, time
1212
from decimal import Decimal
13+
from numbers import Number
14+
from fractions import Fraction
1315
import numpy as np
1416
import pytz
1517
import pytest
16-
from numbers import Number
17-
from fractions import Fraction
1818
import pandas as pd
1919
from pandas._libs import tslib, lib, missing as libmissing
2020
from pandas import (Series, Index, DataFrame, Timedelta,

0 commit comments

Comments
 (0)