Skip to content

Commit 8078500

Browse files
jbrockmendeljreback
authored andcommitted
move rename functionality out of internals (#21924)
1 parent ed65364 commit 8078500

File tree

3 files changed

+13
-21
lines changed

3 files changed

+13
-21
lines changed

.coveragerc

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ exclude_lines =
1717
# Don't complain if tests don't hit defensive assertion code:
1818
raise AssertionError
1919
raise NotImplementedError
20+
AbstractMethodError
2021

2122
# Don't complain if non-runnable code isn't run:
2223
if 0:

pandas/core/generic.py

+10-8
Original file line numberDiff line numberDiff line change
@@ -289,10 +289,7 @@ def set_axis(a, i):
289289
for i, a in cls._AXIS_NAMES.items():
290290
set_axis(a, i)
291291

292-
# addtl parms
293-
if isinstance(ns, dict):
294-
for k, v in ns.items():
295-
setattr(cls, k, v)
292+
assert not isinstance(ns, dict)
296293

297294
def _construct_axes_dict(self, axes=None, **kwargs):
298295
"""Return an axes dictionary for myself."""
@@ -3483,8 +3480,10 @@ def add_prefix(self, prefix):
34833480
2 3 5
34843481
3 4 6
34853482
"""
3486-
new_data = self._data.add_prefix(prefix)
3487-
return self._constructor(new_data).__finalize__(self)
3483+
f = functools.partial('{prefix}{}'.format, prefix=prefix)
3484+
3485+
mapper = {self._info_axis_name: f}
3486+
return self.rename(**mapper)
34883487

34893488
def add_suffix(self, suffix):
34903489
"""
@@ -3540,8 +3539,10 @@ def add_suffix(self, suffix):
35403539
2 3 5
35413540
3 4 6
35423541
"""
3543-
new_data = self._data.add_suffix(suffix)
3544-
return self._constructor(new_data).__finalize__(self)
3542+
f = functools.partial('{}{suffix}'.format, suffix=suffix)
3543+
3544+
mapper = {self._info_axis_name: f}
3545+
return self.rename(**mapper)
35453546

35463547
_shared_docs['sort_values'] = """
35473548
Sort by the values along either axis
@@ -4057,6 +4058,7 @@ def _reindex_with_indexers(self, reindexers, fill_value=None, copy=False,
40574058

40584059
return self._constructor(new_data).__finalize__(self)
40594060

4061+
# TODO: unused; remove?
40604062
def _reindex_axis(self, new_index, fill_method, axis, copy):
40614063
new_data = self._data.reindex_axis(new_index, axis=axis,
40624064
method=fill_method, copy=copy)

pandas/core/internals/managers.py

+2-13
Original file line numberDiff line numberDiff line change
@@ -176,20 +176,11 @@ def rename_axis(self, mapper, axis, copy=True, level=None):
176176
axis : int
177177
copy : boolean, default True
178178
level : int, default None
179-
180179
"""
181180
obj = self.copy(deep=copy)
182181
obj.set_axis(axis, _transform_index(self.axes[axis], mapper, level))
183182
return obj
184183

185-
def add_prefix(self, prefix):
186-
f = partial('{prefix}{}'.format, prefix=prefix)
187-
return self.rename_axis(f, axis=0)
188-
189-
def add_suffix(self, suffix):
190-
f = partial('{}{suffix}'.format, suffix=suffix)
191-
return self.rename_axis(f, axis=0)
192-
193184
@property
194185
def _is_single_block(self):
195186
if self.ndim == 1:
@@ -222,12 +213,10 @@ def _rebuild_blknos_and_blklocs(self):
222213
self._blknos = new_blknos
223214
self._blklocs = new_blklocs
224215

225-
# make items read only for now
226-
def _get_items(self):
216+
@property
217+
def items(self):
227218
return self.axes[0]
228219

229-
items = property(fget=_get_items)
230-
231220
def _get_counts(self, f):
232221
""" return a dict of the counts of the function in BlockManager """
233222
self._consolidate_inplace()

0 commit comments

Comments
 (0)