Visitar URL original
gh-83861: Fix datetime.astimezone() method by abalkin · Pull Request #101545 · python/cpython · GitHub
Skip to content

gh-83861: Fix datetime.astimezone() method #101545

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
miss-islington merged 3 commits into from
Apr 19, 2023
Merged

gh-83861: Fix datetime.astimezone() method #101545

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3b6683
Fix datetime.astimezone() method (gh-83861)
abalkin Feb 3, 2023
b665d10
WIP - add "naive" fix for C implementation
abalkin Feb 5, 2023
7634ca2
Add a NEWS entry
abalkin Feb 6, 2023
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
Prev Previous commit
Next Next commit
WIP - add "naive" fix for C implementation
  • Loading branch information
@abalkin
abalkin committed Feb 6, 2023
commit b665d1048699d16ce223ddc632c3ae4a1b537f5e
18 changes: 16 additions & 2 deletions Modules/_datetimemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6153,17 +6153,31 @@ local_to_seconds(int year, int month, int day,
static PyObject *
local_timezone_from_local(PyDateTime_DateTime *local_dt)
{
long long seconds;
long long seconds, seconds2;
time_t timestamp;
int fold = DATE_GET_FOLD(local_dt);
seconds = local_to_seconds(GET_YEAR(local_dt),
GET_MONTH(local_dt),
GET_DAY(local_dt),
DATE_GET_HOUR(local_dt),
DATE_GET_MINUTE(local_dt),
DATE_GET_SECOND(local_dt),
DATE_GET_FOLD(local_dt));
fold);
if (seconds == -1)
return NULL;
seconds2 = local_to_seconds(GET_YEAR(local_dt),
GET_MONTH(local_dt),
GET_DAY(local_dt),
DATE_GET_HOUR(local_dt),
DATE_GET_MINUTE(local_dt),
DATE_GET_SECOND(local_dt),
!fold);
if (seconds2 == -1)
return NULL;
/* Detect gap */
if (seconds2 != seconds && (seconds2 > seconds) == fold)
seconds = seconds2;

/* XXX: add bounds check */
timestamp = seconds - epoch;
return local_timezone_from_timestamp(timestamp);
Expand Down