gh-133940: test_strftime incorrectly calculates expected week #134281
Follow Lee on X/Twitter - Father, Husband, Serial builder creating AI, crypto, games & web tools. We are friends :) AI Will Come To Life!
Check out: eBank.nz (Art Generator) |
Netwrck.com (AI Tools) |
Text-Generator.io (AI API) |
BitBank.nz (Crypto AI) |
ReadingTime (Kids Reading) |
RewordGame |
BigMultiplayerChess |
WebFiddle |
How.nz |
Helix AI Assistant
Conversation
|
All commit authors signed the Contributor License Agreement. |
|
Most changes to Python blurb command-line tool. If this change has little impact on Python users, wait for a maintainer to apply the |
|
This is a test change so no NEWS entry needed |
| jan1 = time.struct_time( | ||
| ( | ||
| now.tm_year, # Year | ||
| 1, # Month (January) | ||
| 1, # Day (1st) | ||
| 0, # Hour (0) | ||
| 0, # Minute (0) | ||
| 0, # Second (0) | ||
| -1, # tm_wday (will be determined) | ||
| 1, # tm_yday (day 1 of the year) | ||
| -1, # tm_isdst (let the system determine) | ||
| ) | ||
| ) | ||
| # use mktime to get the correct tm_wday and tm_isdst values | ||
| self.jan1 = time.localtime(time.mktime(jan1)) |
There was a problem hiding this comment.
| jan1 = time.struct_time( | |
| ( | |
| now.tm_year, # Year | |
| 1, # Month (January) | |
| 1, # Day (1st) | |
| 0, # Hour (0) | |
| 0, # Minute (0) | |
| 0, # Second (0) | |
| -1, # tm_wday (will be determined) | |
| 1, # tm_yday (day 1 of the year) | |
| -1, # tm_isdst (let the system determine) | |
| ) | |
| ) | |
| # use mktime to get the correct tm_wday and tm_isdst values | |
| self.jan1 = time.localtime(time.mktime(jan1)) | |
| self.jan1 = time.localtime(time.mktime((now[0], 1, 1, 0, -1, 1, -1))) |
Why not just all on one line like before, it seems clear to me, and this is a test after all.
There was a problem hiding this comment.
FWIW I like the long version myself.
There was a problem hiding this comment.
IMO it is overkill and distracting, if you are looking at these tests you are probably familiar with struct_time anyway.
|
!buildbot raspbian |
@gpshead There is no point unless you have changed the config on yours? It seems buildbot is down right now too. |
|
Thanks @gpshead for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13, 3.14. |
…ythonGH-134281) Let the system determine the correct tm_wday and tm_isdst. (cherry picked from commit e3dda8f) Co-authored-by: Gustaf <79180496+GGyll@users.noreply.github.com>
…ythonGH-134281) Let the system determine the correct tm_wday and tm_isdst. (cherry picked from commit e3dda8f) Co-authored-by: Gustaf <79180496+GGyll@users.noreply.github.com>
self.jan1 results to January 1st 2024 if set to Irish Time Zone. By letting time.mktime correct the tm_wday and tm_isdst values we can prevent this and we will always get the current year.
test_strftimeincorrectly calculates expected week #133940