Skip to content

Commit 2aa52c9

Browse files
committed
Merge pull request #4843 from jtratner/remove-rwproperty
CLN: replace rwproperty with regular property
2 parents b0d7859 + 5f34827 commit 2aa52c9

File tree

5 files changed

+11
-88
lines changed

5 files changed

+11
-88
lines changed

doc/source/release.rst

+1
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ See :ref:`Internal Refactoring<whatsnew_0130.refactoring>`
287287
- Refactor of Series arithmetic with time-like objects (datetime/timedelta/time
288288
etc.) into a separate, cleaned up wrapper class. (:issue:`4613`)
289289
- Complex compat for ``Series`` with ``ndarray``. (:issue:`4819`)
290+
- Removed unnecessary ``rwproperty`` from codebase in favor of builtin property. (:issue:`4843`)
290291

291292
Experimental Features
292293
~~~~~~~~~~~~~~~~~~~~~

pandas/core/internals.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
from pandas.tslib import Timestamp
2525
from pandas import compat
2626
from pandas.compat import range, lrange, lmap, callable, map, zip
27-
from pandas.util import rwproperty
2827

2928

3029
class Block(PandasObject):
@@ -1450,22 +1449,22 @@ def shape(self):
14501449
def itemsize(self):
14511450
return self.dtype.itemsize
14521451

1453-
@rwproperty.getproperty
1452+
@property
14541453
def fill_value(self):
14551454
return self.values.fill_value
14561455

1457-
@rwproperty.setproperty
1456+
@fill_value.setter
14581457
def fill_value(self, v):
14591458
# we may need to upcast our fill to match our dtype
14601459
if issubclass(self.dtype.type, np.floating):
14611460
v = float(v)
14621461
self.values.fill_value = v
14631462

1464-
@rwproperty.getproperty
1463+
@property
14651464
def sp_values(self):
14661465
return self.values.sp_values
14671466

1468-
@rwproperty.setproperty
1467+
@sp_values.setter
14691468
def sp_values(self, v):
14701469
# reset the sparse values
14711470
self.values = SparseArray(

pandas/core/series.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
from pandas import compat
3838
from pandas.util.terminal import get_terminal_size
3939
from pandas.compat import zip, lzip, u, OrderedDict
40-
from pandas.util import rwproperty
4140

4241
import pandas.core.array as pa
4342

@@ -797,19 +796,19 @@ def __contains__(self, key):
797796
return key in self.index
798797

799798
# complex
800-
@rwproperty.getproperty
799+
@property
801800
def real(self):
802801
return self.values.real
803802

804-
@rwproperty.setproperty
803+
@real.setter
805804
def real(self, v):
806805
self.values.real = v
807806

808-
@rwproperty.getproperty
807+
@property
809808
def imag(self):
810809
return self.values.imag
811810

812-
@rwproperty.setproperty
811+
@imag.setter
813812
def imag(self, v):
814813
self.values.imag = v
815814

pandas/sparse/series.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import pandas.index as _index
2222

2323
from pandas import compat
24-
from pandas.util import rwproperty
2524

2625
from pandas.sparse.array import (make_sparse, _sparse_array_op, SparseArray)
2726
from pandas._sparse import BlockIndex, IntIndex
@@ -213,11 +212,11 @@ def get_values(self):
213212
def block(self):
214213
return self._data._block
215214

216-
@rwproperty.getproperty
215+
@property
217216
def fill_value(self):
218217
return self.block.fill_value
219218

220-
@rwproperty.setproperty
219+
@fill_value.setter
221220
def fill_value(self, v):
222221
self.block.fill_value = v
223222

pandas/util/rwproperty.py

-75
This file was deleted.

0 commit comments

Comments
 (0)