Skip to content

Commit b59e640

Browse files
committed
adjust for comments
1 parent e8aef0b commit b59e640

File tree

5 files changed

+16
-15
lines changed

5 files changed

+16
-15
lines changed

pandas/core/base.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1339,7 +1339,7 @@ def factorize(self, sort=False, na_sentinel=-1):
13391339
Parameters
13401340
----------
13411341
value : scalar or array_like
1342-
Value(s) to insert into `self`.
1342+
Value(s) to insert into `self`.t
13431343
side : {'left', 'right'}, optional
13441344
If 'left', the index of the first suitable location found is given.
13451345
If 'right', return the last such index. If there is no suitable

pandas/tests/arrays/categorical/test_analytics.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from pandas.compat import PYPY
99

1010
from pandas import Categorical, Index, Series
11+
from pandas.api.types import is_scalar
1112
import pandas.util.testing as tm
1213

1314

@@ -86,11 +87,11 @@ def test_searchsorted(self):
8687
# Searching for single item argument, side='left' (default)
8788
res_cat = c1.searchsorted('apple')
8889
assert res_cat == 2
89-
assert tm.is_scalar(res_cat)
90+
assert is_scalar(res_cat)
9091

9192
res_ser = s1.searchsorted('apple')
9293
assert res_ser == 2
93-
assert tm.is_scalar(res_ser)
94+
assert is_scalar(res_ser)
9495

9596
# Searching for single item array, side='left' (default)
9697
res_cat = c1.searchsorted(['bread'])

pandas/tests/indexes/multi/test_monotonic.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import pandas as pd
77
from pandas import Index, IntervalIndex, MultiIndex
8-
import pandas.util.testing as tm
8+
from pandas.api.types import is_scalar
99

1010

1111
def test_is_monotonic_increasing():
@@ -183,28 +183,28 @@ def test_searchsorted_monotonic(indices):
183183
# test searchsorted only for increasing
184184
if indices.is_monotonic_increasing:
185185
ssm_left = indices._searchsorted_monotonic(value, side='left')
186-
assert tm.is_scalar(ssm_left)
186+
assert is_scalar(ssm_left)
187187
assert expected_left == ssm_left
188188

189189
ssm_right = indices._searchsorted_monotonic(value, side='right')
190-
assert tm.is_scalar(ssm_right)
190+
assert is_scalar(ssm_right)
191191
assert expected_right == ssm_right
192192

193193
ss_left = indices.searchsorted(value, side='left')
194-
assert tm.is_scalar(ss_left)
194+
assert is_scalar(ss_left)
195195
assert expected_left == ss_left
196196

197197
ss_right = indices.searchsorted(value, side='right')
198-
assert tm.is_scalar(ss_right)
198+
assert is_scalar(ss_right)
199199
assert expected_right == ss_right
200200

201201
elif indices.is_monotonic_decreasing:
202202
ssm_left = indices._searchsorted_monotonic(value, side='left')
203-
assert tm.is_scalar(ssm_left)
203+
assert is_scalar(ssm_left)
204204
assert expected_left == ssm_left
205205

206206
ssm_right = indices._searchsorted_monotonic(value, side='right')
207-
assert tm.is_scalar(ssm_right)
207+
assert is_scalar(ssm_right)
208208
assert expected_right == ssm_right
209209

210210
else:

pandas/tests/series/test_analytics.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
from pandas import (
1717
Categorical, CategoricalIndex, DataFrame, Series, bdate_range, compat,
1818
date_range, isna, notna)
19+
from pandas.api.types import is_scalar
1920
from pandas.core.index import MultiIndex
2021
from pandas.core.indexes.datetimes import Timestamp
2122
from pandas.core.indexes.timedeltas import Timedelta
@@ -1365,17 +1366,17 @@ def test_searchsorted(self):
13651366
s = Series([1, 2, 3])
13661367

13671368
result = s.searchsorted(1, side='left')
1368-
assert tm.is_scalar(result)
1369+
assert is_scalar(result)
13691370
assert result == 0
13701371

13711372
result = s.searchsorted(1, side='right')
1372-
assert tm.is_scalar(result)
1373+
assert is_scalar(result)
13731374
assert result == 1
13741375

13751376
def test_searchsorted_numeric_dtypes_scalar(self):
13761377
s = Series([1, 2, 90, 1000, 3e9])
13771378
r = s.searchsorted(30)
1378-
assert tm.is_scalar(r)
1379+
assert is_scalar(r)
13791380
assert r == 2
13801381

13811382
r = s.searchsorted([30])
@@ -1392,7 +1393,7 @@ def test_search_sorted_datetime64_scalar(self):
13921393
s = Series(pd.date_range('20120101', periods=10, freq='2D'))
13931394
v = pd.Timestamp('20120102')
13941395
r = s.searchsorted(v)
1395-
assert tm.is_scalar(r)
1396+
assert is_scalar(r)
13961397
assert r == 1
13971398

13981399
def test_search_sorted_datetime64_list(self):

pandas/util/testing.py

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
is_datetimelike_v_numeric, is_datetimelike_v_object,
2929
is_extension_array_dtype, is_interval_dtype, is_list_like, is_number,
3030
is_period_dtype, is_sequence, is_timedelta64_dtype, needs_i8_conversion)
31-
from pandas.core.dtypes.common import is_scalar # noqa: F401
3231
from pandas.core.dtypes.missing import array_equivalent
3332

3433
import pandas as pd

0 commit comments

Comments
 (0)