Skip to content

Commit

Permalink
Fix import under PyPy 3.8/3.9 on Windows (#7850)
Browse files Browse the repository at this point in the history
Fixes #7848.
  • Loading branch information
JelleZijlstra authored Nov 19, 2023
1 parent 6f76673 commit 22170b2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES/7848.bugfix
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
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

0 comments on commit 22170b2

Please sign in to comment.