[PR #7850/22170b21 backport][3.9] Fix import under PyPy 3.8/3.9 on Wi…

…ndows (#7854) **This is a backport of PR #7850 as merged into master (22170b2).** Fixes #7848. Co-authored-by: Jelle Zijlstra <[email protected]>
aio-libs · Nov 19, 2023 · c491ed7 · c491ed7
1 parent 68c9697
commit c491ed7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES/7848.bugfix b/CHANGES/7848.bugfix
@@ -0,0 +1 @@
+Fix importing aiohttp under PyPy 3.8 and 3.9 on Windows.
diff --git a/aiohttp/cookiejar.py b/aiohttp/cookiejar.py
@@ -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
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.