Skip to content

API: Timestamp and Timedelta .value changing in 2.0 #50891

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.

Sign up for GitHub

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

Merged
merged 24 commits into from
Feb 9, 2023
Merged

API: Timestamp and Timedelta .value changing in 2.0 #50891

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
84ea60f
wip
Jan 18, 2023
540113a
wip
Jan 18, 2023
82da04f
fixup test collection
Jan 18, 2023
c026a4f
divide by zero to debug LOL
Jan 18, 2023
378dbef
wip
Jan 18, 2023
dd6d8b4
more fixups
Jan 18, 2023
af97b06
fixup test unary ops
Jan 18, 2023
aeb49d7
ewm
Jan 20, 2023
1f271ca
test offseetes
Jan 20, 2023
3b96637
are we there yet?
Jan 20, 2023
b0c4098
Merge remote-tracking branch 'upstream/main' into timestamp-value
Jan 23, 2023
a5aa8e0
_value in ujson
Jan 24, 2023
50476ca
Merge remote-tracking branch 'upstream/main' into timestamp-value
Jan 24, 2023
a0cf7d4
:label: typing
Jan 24, 2023
255c4bd
Merge remote-tracking branch 'upstream/main' into timestamp-value
Feb 1, 2023
db72dd7
wip
Feb 1, 2023
16003f9
advise to use asm8 instead
Feb 1, 2023
0a2cec7
Merge branch 'main' into timestamp-value
MarcoGorelli Feb 2, 2023
2a11315
Merge remote-tracking branch 'upstream/main' into timestamp-value
Feb 2, 2023
2b4da6c
fix test missing
Feb 2, 2023
8813511
Merge remote-tracking branch 'upstream/main' into timestamp-value
Feb 6, 2023
9b50ffa
make value property
Feb 6, 2023
79b3f13
un-xfail test
Feb 6, 2023
ea4d898
Merge remote-tracking branch 'upstream/main' into timestamp-value
Feb 6, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
_value in ujson
  • Loading branch information
MarcoGorelli committed Jan 24, 2023
commit a5aa8e092adbf1f0b89a0f6f1f20a8cb6b83c89e
8 changes: 4 additions & 4 deletions pandas/_libs/src/ujson/python/objToJSON.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1306,9 +1306,9 @@ char **NpyArr_encodeLabels(PyArrayObject *labels, PyObjectEncoder *enc,
castfunc(dataptr, &nanosecVal, 1, NULL, NULL);
} else if (PyDate_Check(item) || PyDelta_Check(item)) {
is_datetimelike = 1;
if (PyObject_HasAttrString(item, "value")) {
if (PyObject_HasAttrString(item, "_value")) {
// see test_date_index_and_values for case with non-nano
nanosecVal = get_long_attr(item, "value");
nanosecVal = get_long_attr(item, "_value");
} else {
if (PyDelta_Check(item)) {
nanosecVal = total_seconds(item) *
Expand Down Expand Up @@ -1554,8 +1554,8 @@ void Object_beginTypeContext(JSOBJ _obj, JSONTypeContext *tc) {
}
return;
} else if (PyDelta_Check(obj)) {
if (PyObject_HasAttrString(obj, "value")) {
value = get_long_attr(obj, "value");
if (PyObject_HasAttrString(obj, "_value")) {
value = get_long_attr(obj, "_value");
} else {
value = total_seconds(obj) * 1000000000LL; // nanoseconds per sec
}
Expand Down