-
-
Notifications
You must be signed in to change notification settings - Fork 18.1k
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
Make pd.Period immutable #17239
Changes from 4 commits
89cf9d6
e6ca02c
8912283
d33922f
b86a7b9
1c6f197
08a218c
2642366
6c461eb
0e62865
cd687bf
dc2111c
1e92344
19567c8
f739f8f
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,8 +3,7 @@ import operator | |
|
||
from cpython cimport ( | ||
PyObject_RichCompareBool, | ||
Py_EQ, Py_NE, | ||
) | ||
Py_EQ, Py_NE) | ||
|
||
from numpy cimport (int8_t, int32_t, int64_t, import_array, ndarray, | ||
NPY_INT64, NPY_DATETIME, NPY_TIMEDELTA) | ||
|
@@ -19,8 +18,11 @@ from pandas import compat | |
from pandas.compat import PY2 | ||
|
||
cimport cython | ||
# this is _libs.src.datetime, not python stdlib | ||
from datetime cimport * | ||
|
||
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, | ||
|
@@ -683,13 +685,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): | ||
|
||
|
@@ -713,9 +719,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) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should this be There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think so. |
||
return self | ||
|
||
def __richcmp__(self, other, op): | ||
|
@@ -767,7 +772,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: | ||
|
@@ -785,7 +790,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 | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -248,3 +248,13 @@ def test_empty_like(self): | |
expected = np.array([True]) | ||
|
||
self._check_behavior(arr, expected) | ||
|
||
|
||
def test_period_immutable(): | ||
per = pd.Period('2014Q1') | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. add the issue number here. move test to tests for period scalars. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sure. |
||
with pytest.raises(AttributeError, message="is not writable"): | ||
per.ordinal = 14 | ||
|
||
freq = per.freq | ||
with pytest.raises(AttributeError, message="is not writable"): | ||
per.freq = 2 * freq |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
don't add superfluous comments
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Similar comments exist elsewhere e.g. in lib.pyx:
This name overlap is an easy source of confusion.
Not worth arguing about so I'll change it. Just sayin'.