Skip to content

Commit 6016b98

Browse files
authored
CLN: address FIXME comments (#33881)
1 parent 2289a55 commit 6016b98

File tree

8 files changed

+21
-63
lines changed

8 files changed

+21
-63
lines changed

pandas/plotting/_matplotlib/converter.py

-37
Original file line numberDiff line numberDiff line change
@@ -387,23 +387,6 @@ def __call__(self):
387387
return []
388388

389389
# We need to cap at the endpoints of valid datetime
390-
391-
# FIXME: dont leave commented-out
392-
# TODO(wesm) unused?
393-
# if dmin > dmax:
394-
# dmax, dmin = dmin, dmax
395-
# delta = relativedelta(dmax, dmin)
396-
# try:
397-
# start = dmin - delta
398-
# except ValueError:
399-
# start = _from_ordinal(1.0)
400-
401-
# try:
402-
# stop = dmax + delta
403-
# except ValueError:
404-
# # The magic number!
405-
# stop = _from_ordinal(3652059.9999999)
406-
407390
nmax, nmin = dates.date2num((dmax, dmin))
408391

409392
num = (nmax - nmin) * 86400 * 1000
@@ -449,27 +432,7 @@ def autoscale(self):
449432
"""
450433
Set the view limits to include the data range.
451434
"""
452-
dmin, dmax = self.datalim_to_dt()
453-
if dmin > dmax:
454-
dmax, dmin = dmin, dmax
455-
456435
# We need to cap at the endpoints of valid datetime
457-
458-
# FIXME: dont leave commented-out
459-
# TODO(wesm): unused?
460-
461-
# delta = relativedelta(dmax, dmin)
462-
# try:
463-
# start = dmin - delta
464-
# except ValueError:
465-
# start = _from_ordinal(1.0)
466-
467-
# try:
468-
# stop = dmax + delta
469-
# except ValueError:
470-
# # The magic number!
471-
# stop = _from_ordinal(3652059.9999999)
472-
473436
dmin, dmax = self.datalim_to_dt()
474437

475438
vmin = dates.date2num(dmin)

pandas/tests/extension/test_boolean.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,5 @@ class TestUnaryOps(base.BaseUnaryOpsTests):
356356
pass
357357

358358

359-
# FIXME: dont leave commented-out
360-
# TODO parsing not yet supported
361-
# class TestParsing(base.BaseParsingTests):
362-
# pass
359+
class TestParsing(base.BaseParsingTests):
360+
pass

pandas/tests/indexes/multi/test_indexing.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -519,14 +519,15 @@ def test_get_loc_duplicates(self):
519519
result = index.get_loc(2)
520520
expected = slice(0, 4)
521521
assert result == expected
522-
# FIXME: dont leave commented-out
523-
# pytest.raises(Exception, index.get_loc, 2)
524522

525523
index = Index(["c", "a", "a", "b", "b"])
526524
rs = index.get_loc("c")
527525
xp = 0
528526
assert rs == xp
529527

528+
with pytest.raises(KeyError):
529+
index.get_loc(2)
530+
530531
def test_get_loc_level(self):
531532
index = MultiIndex(
532533
levels=[Index(np.arange(4)), Index(np.arange(4)), Index(np.arange(4))],

pandas/tests/indexes/multi/test_take.py

-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ def test_take(idx):
1111
expected = idx[indexer]
1212
assert result.equals(expected)
1313

14-
# FIXME: Remove Commented Code
15-
# if not isinstance(idx,
16-
# (DatetimeIndex, PeriodIndex, TimedeltaIndex)):
1714
# GH 10791
1815
msg = "'MultiIndex' object has no attribute 'freq'"
1916
with pytest.raises(AttributeError, match=msg):

pandas/tests/indexing/test_indexing.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -809,8 +809,7 @@ def test_range_in_series_indexing(self, size):
809809
@pytest.mark.parametrize(
810810
"slc",
811811
[
812-
# FIXME: dont leave commented-out
813-
# pd.IndexSlice[:, :],
812+
pd.IndexSlice[:, :],
814813
pd.IndexSlice[:, 1],
815814
pd.IndexSlice[1, :],
816815
pd.IndexSlice[[1], [1]],

pandas/tests/io/test_sql.py

-2
Original file line numberDiff line numberDiff line change
@@ -1130,8 +1130,6 @@ def setup_method(self, load_iris_data):
11301130
self.conn.close()
11311131
self.conn = self.__engine
11321132
self.pandasSQL = sql.SQLDatabase(self.__engine)
1133-
# FIXME: dont leave commented-out
1134-
# super().teardown_method(method)
11351133

11361134

11371135
@pytest.mark.single

pandas/tests/reductions/test_reductions.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -942,10 +942,8 @@ def test_timedelta64_analytics(self):
942942
s2 = Series(pd.date_range("20120102", periods=3))
943943
expected = Series(s2 - s1)
944944

945-
# FIXME: don't leave commented-out code
946-
# this fails as numpy returns timedelta64[us]
947-
# result = np.abs(s1-s2)
948-
# assert_frame_equal(result,expected)
945+
result = np.abs(s1 - s2)
946+
tm.assert_series_equal(result, expected)
949947

950948
result = (s1 - s2).abs()
951949
tm.assert_series_equal(result, expected)

pandas/tests/series/test_constructors.py

+13-9
Original file line numberDiff line numberDiff line change
@@ -1323,18 +1323,22 @@ def test_convert_non_ns(self):
13231323
# convert from a numpy array of non-ns datetime64
13241324
# note that creating a numpy datetime64 is in LOCAL time!!!!
13251325
# seems to work for M8[D], but not for M8[s]
1326+
# TODO: is the above comment still accurate/needed?
13261327

1327-
s = Series(
1328-
np.array(["2013-01-01", "2013-01-02", "2013-01-03"], dtype="datetime64[D]")
1328+
arr = np.array(
1329+
["2013-01-01", "2013-01-02", "2013-01-03"], dtype="datetime64[D]"
13291330
)
1330-
tm.assert_series_equal(s, Series(date_range("20130101", periods=3, freq="D")))
1331-
1332-
# FIXME: dont leave commented-out
1333-
# s = Series(np.array(['2013-01-01 00:00:01','2013-01-01
1334-
# 00:00:02','2013-01-01 00:00:03'],dtype='datetime64[s]'))
1331+
ser = Series(arr)
1332+
expected = Series(date_range("20130101", periods=3, freq="D"))
1333+
tm.assert_series_equal(ser, expected)
13351334

1336-
# tm.assert_series_equal(s,date_range('20130101
1337-
# 00:00:01',period=3,freq='s'))
1335+
arr = np.array(
1336+
["2013-01-01 00:00:01", "2013-01-01 00:00:02", "2013-01-01 00:00:03"],
1337+
dtype="datetime64[s]",
1338+
)
1339+
ser = Series(arr)
1340+
expected = Series(date_range("20130101 00:00:01", periods=3, freq="s"))
1341+
tm.assert_series_equal(ser, expected)
13381342

13391343
@pytest.mark.parametrize(
13401344
"index",

0 commit comments

Comments
 (0)