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 compatibility with Python 3.10, refs #358 #359

Merged
merged 3 commits into from
Oct 24, 2021
+5 −1
Merged

Fix compatibility with Python 3.10, refs #358 #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e13d3f
Fix compatibility with Python 3.10, refs #358
simonw Oct 8, 2021
b52fb27
Apply workaround to buggy Python version only
asvetlov Oct 24, 2021
5f2a387
Fix typo
asvetlov Oct 24, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
needs: lint
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Necessary to use strings rather than floating point numbers here, because otherwise 3.10 is interpreted as 3.1

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd say only wrap "3.10" and keep others as is.

Copy link
Member

@achimnol achimnol Oct 10, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's better to wrap them all for consistency, but have no strong opinion on this as long as it would not make future confusion.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both variants work technically.
I prefer the current version; if we process 3.10 as a string -- why others should be numbers? Again, technically the version is not a number but a string.

os: [ubuntu]
fail-fast:
false
Expand Down
4 changes: 4 additions & 0 deletions janus/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import asyncio
import sys
import threading
from asyncio import QueueEmpty as AsyncQueueEmpty
from asyncio import QueueFull as AsyncQueueFull
Expand Down Expand Up @@ -36,6 +37,9 @@ def __init__(self, maxsize: int = 0) -> None:
self._all_tasks_done = threading.Condition(self._sync_mutex)

self._async_mutex = asyncio.Lock()
if sys.version_info[:3] == (3, 10, 0):
# Workaround for Python 3.10 bug, see #358:
getattr(self._async_mutex, '_get_loop', lambda: None)()
self._async_not_empty = asyncio.Condition(self._async_mutex)
self._async_not_full = asyncio.Condition(self._async_mutex)
self._finished = asyncio.Event()
Expand Down