Skip to content

Commit 3c3e58b

Browse files
committed
CLN: remove compat.iterkeys
1 parent 190a69e commit 3c3e58b

File tree

5 files changed

+9
-15
lines changed

5 files changed

+9
-15
lines changed

pandas/compat/__init__.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
77
Key items to import for compatible code:
88
* lists: lrange(), lmap(), lzip(), lfilter()
9-
* iterable method compatibility: iteritems, iterkeys, itervalues
9+
* iterable method compatibility: iteritems, itervalues
1010
* Uses the original method if available, otherwise uses items, keys, values.
1111
* add_metaclass(metaclass) - class decorator that recreates class with with the
1212
given metaclass instead (and avoids intermediary class creation)
@@ -49,10 +49,6 @@ def iteritems(obj, **kw):
4949
return iter(obj.items(**kw))
5050

5151

52-
def iterkeys(obj, **kw):
53-
return iter(obj.keys(**kw))
54-
55-
5652
def itervalues(obj, **kw):
5753
return iter(obj.values(**kw))
5854

pandas/core/base.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ def nested_renaming_depr(level=4):
401401
else:
402402
# deprecation of renaming keys
403403
# GH 15931
404-
keys = list(compat.iterkeys(arg))
404+
keys = list(arg.keys())
405405
if (isinstance(obj, ABCDataFrame) and
406406
len(obj.columns.intersection(keys)) != len(keys)):
407407
nested_renaming_depr()
@@ -437,7 +437,7 @@ def _agg(arg, func):
437437
return result
438438

439439
# set the final keys
440-
keys = list(compat.iterkeys(arg))
440+
keys = list(arg.keys())
441441
result = OrderedDict()
442442

443443
# nested renamer
@@ -449,7 +449,7 @@ def _agg(arg, func):
449449
result, results = OrderedDict(), result
450450
for r in results:
451451
result.update(r)
452-
keys = list(compat.iterkeys(result))
452+
keys = list(result.keys())
453453

454454
else:
455455

pandas/io/stata.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
ensure_object, is_categorical_dtype, is_datetime64_dtype)
3131

3232
from pandas import (
33-
Categorical, DatetimeIndex, NaT, Timestamp, compat, concat, isna,
34-
to_datetime, to_timedelta)
33+
Categorical, DatetimeIndex, NaT, Timestamp, concat, isna, to_datetime,
34+
to_timedelta)
3535
from pandas.core.base import StringMixin
3636
from pandas.core.frame import DataFrame
3737
from pandas.core.series import Series
@@ -1700,7 +1700,7 @@ def _do_convert_categoricals(self, data, value_label_dict, lbllist,
17001700
"""
17011701
Converts categorical columns to Categorical type.
17021702
"""
1703-
value_labels = list(compat.iterkeys(value_label_dict))
1703+
value_labels = list(value_label_dict.keys())
17041704
cat_converted_data = []
17051705
for col, label in zip(data, lbllist):
17061706
if label in value_labels:

pandas/tests/io/test_stata.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import pytest
1515

1616
import pandas.compat as compat
17-
from pandas.compat import iterkeys
1817

1918
from pandas.core.dtypes.common import is_categorical_dtype
2019

@@ -758,7 +757,7 @@ def test_missing_value_generator(self):
758757
def test_missing_value_conversion(self, file):
759758
columns = ['int8_', 'int16_', 'int32_', 'float32_', 'float64_']
760759
smv = StataMissingValue(101)
761-
keys = [key for key in iterkeys(smv.MISSING_VALUES)]
760+
keys = [key for key in smv.MISSING_VALUES.keys()]
762761
keys.sort()
763762
data = []
764763
for i in range(27):

pandas/tests/test_compat.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import re
77

88
from pandas.compat import (
9-
iteritems, iterkeys, itervalues, lfilter, lmap, lrange, lzip, re_type)
9+
iteritems, itervalues, lfilter, lmap, lrange, lzip, re_type)
1010

1111

1212
class TestBuiltinIterators(object):
@@ -53,7 +53,6 @@ def test_lzip(self):
5353

5454
def test_dict_iterators(self):
5555
assert next(itervalues({1: 2})) == 2
56-
assert next(iterkeys({1: 2})) == 1
5756
assert next(iteritems({1: 2})) == (1, 2)
5857

5958

0 commit comments

Comments
 (0)