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.

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

Fix import under PyPy 3.8/3.9 on Windows #7850

Merged
merged 6 commits into from
Nov 19, 2023
Merged

Fix import under PyPy 3.8/3.9 on Windows #7850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3530c60
Run CI on PyPy 3.8
JelleZijlstra Nov 18, 2023
3adb01e
windows
JelleZijlstra Nov 18, 2023
caa5a02
Catch ValueError
JelleZijlstra Nov 18, 2023
4646d62
3.9 too
JelleZijlstra Nov 18, 2023
4b4c22e
Add changelog entry
JelleZijlstra Nov 18, 2023
5fbfd6c
back to linux
JelleZijlstra Nov 18, 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
1 change: 1 addition & 0 deletions CHANGES/7848.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix importing aiohttp under PyPy 3.8 and 3.9 on Windows.
3 changes: 2 additions & 1 deletion aiohttp/cookiejar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,10 @@ class CookieJar(AbstractCookieJar):
)
try:
calendar.timegm(time.gmtime(MAX_TIME))
except OSError:
except (OSError, ValueError):
# Hit the maximum representable time on Windows
# https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/localtime-localtime32-localtime64
# Throws ValueError on PyPy 3.8 and 3.9, OSError elsewhere
MAX_TIME = calendar.timegm((3000, 12, 31, 23, 59, 59, -1, -1, -1))
except OverflowError:
# #4515: datetime.max may not be representable on 32-bit platforms
Expand Down
Loading