Remove Python 2 compatibility code #662
Merged
+11
−35
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The driver requires Python 3.10+ so these compatibility shims are no longer needed: - Remove try/except for Queue vs queue (use queue directly) - Remove try/except for __builtin__ vs builtins (use builtins directly) - Remove try/except for thread vs _thread (use _thread directly) - Remove try/except for futures vs concurrent.futures (use concurrent.futures directly) - Remove try/except for unittest2 vs unittest (use unittest directly) - Replace deprecated imp.reload with importlib.reload
sylwiaszunejko
approved these changes
Jan 30, 2026
Lorak-mmk
approved these changes
Jan 30, 2026
Lorak-mmk
left a comment
Lorak-mmk
left a comment
There was a problem hiding this comment.
Nice! In the future we could also remove WeakSet from utils.py, I see that std now has it: https://docs.python.org/3/library/weakref.html#weakref.WeakSet ,
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Remove Python 2 compatibility shims that are no longer needed since the driver requires Python 3.10+.
Changes
try/exceptforQueuevsqueue→ usequeuedirectlytry/exceptfor__builtin__vsbuiltins→ usebuiltinsdirectlytry/exceptforthreadvs_thread→ use_threaddirectlytry/exceptforfuturesvsconcurrent.futures→ useconcurrent.futuresdirectlytry/exceptforunittest2vsunittest→ useunittestdirectlyimp.reloadwithimportlib.reloadFiles changed
tests/unit/io/eventlet_utils.pytests/integration/long/test_large_data.pytests/integration/standard/test_shard_aware.pytests/integration/standard/test_use_keyspace.pytests/unit/test_protocol_features.pytests/unit/test_shard_aware.pyTest plan
pytest tests/unit/test_protocol_features.py tests/unit/test_shard_aware.py)