Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make pd.Period immutable #17239

Merged
merged 15 commits into from
Aug 24, 2017
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions doc/source/whatsnew/v0.21.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,16 @@ Other Enhancements
Backwards incompatible API changes
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

.. _whatsnew_0210.api_breaking.Period:

pd.Period objects are now immutable
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just say Period

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

:class:`Period` will now raise an ``AttributeError`` when a user tries to
assign a new value to the `ordinal` or `freq` attributes. This will allow
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you dont need to provide an explanation.

for reliable caching which will improve performance in indexing
operations (:issue:`17116`).

.. _whatsnew_0210.api_breaking.pandas_eval:

Improved error handling during item assignment in pd.eval
Expand Down
17 changes: 11 additions & 6 deletions pandas/_libs/period.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ from datetime cimport (
PANDAS_FR_ns,
INT32_MIN)


cimport util, lib

from lib cimport is_null_datetimelike, is_period
from pandas._libs import tslib, lib
from pandas._libs.tslib import (Timedelta, Timestamp, iNaT,
Expand Down Expand Up @@ -688,13 +690,17 @@ class IncompatibleFrequency(ValueError):

cdef class _Period(object):

cdef public:
cdef readonly:
int64_t ordinal
object freq

_comparables = ['name', 'freqstr']
_typ = 'period'

def __cinit__(self, ordinal, freq):
self.ordinal = ordinal
self.freq = freq

@classmethod
def _maybe_convert_freq(cls, object freq):

Expand All @@ -718,9 +724,8 @@ cdef class _Period(object):
if ordinal == iNaT:
return NaT
else:
self = _Period.__new__(cls)
self.ordinal = ordinal
self.freq = cls._maybe_convert_freq(freq)
freq = cls._maybe_convert_freq(freq)
self = _Period.__new__(cls, ordinal, freq)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be self = cls.__new__...?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so. cls._from_ordinal gets called at the end of Period.__new__, so I expect it explicitly needs to be _Period.

return self

def __richcmp__(self, other, op):
Expand Down Expand Up @@ -772,7 +777,7 @@ cdef class _Period(object):
def __add__(self, other):
if isinstance(self, Period):
if isinstance(other, (timedelta, np.timedelta64,
offsets.Tick, offsets.DateOffset,
offsets.DateOffset,
Timedelta)):
return self._add_delta(other)
elif other is NaT:
Expand All @@ -790,7 +795,7 @@ cdef class _Period(object):
def __sub__(self, other):
if isinstance(self, Period):
if isinstance(other, (timedelta, np.timedelta64,
offsets.Tick, offsets.DateOffset,
offsets.DateOffset,
Timedelta)):
neg_other = -other
return self + neg_other
Expand Down
11 changes: 11 additions & 0 deletions pandas/tests/scalar/test_period.py
Original file line number Diff line number Diff line change
Expand Up @@ -1406,3 +1406,14 @@ def test_period_ops_offset(self):

with tm.assert_raises_regex(period.IncompatibleFrequency, msg):
p - offsets.Hour(2)


def test_period_immutable():
# see gh-17116
per = pd.Period('2014Q1')
with pytest.raises(AttributeError, message="is not writable"):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the message="is not writable" is not needed here, the default assertion message of pytest is normally clear.

If you actually want to check the message of the AttributeError, it is the match keyword you need to use, not message (but I don't think it is needed to test that, it is not a custom error message we write ourselves)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pushing change now.

per.ordinal = 14

freq = per.freq
with pytest.raises(AttributeError, message="is not writable"):
per.freq = 2 * freq