skip `ssl` import if not available #1

dicej · 2023-12-18T16:49:10Z

utils.py has support for detecting whether the ssl module is available, and we can use this to omit SSL-specific funcionality while still providing other features (e.g. unencrypted connections).

Prior to this patch, the connection.py modules both triggered an ImportError due to unconditional imports of the ssl module. Now, we check utils.SSL_AVAILABLE prior to attempting the import and only raise an error later if (and only if) the application requests an encrypted connection. This helps support platforms such as wasm32-wasi where the ssl module is not built by default.

Pull Request check-list

Please make sure to review and check all of these items:

Do tests and lints pass with this change?
Do the CI tests pass with this change (enable it first in your forked repo and wait for the github action build to finish)?
Is the new or changed code fully tested?
Is a documentation update included (if this change modifies existing APIs, or introduces new ones)?
Is there an example added to the examples folder (if applicable)?
Was the change added to CHANGES file?

NOTE: these things are not required to open a PR and can be done
afterwards / while the PR is open.

Description of change

Please provide a description of the change here.

* cache invalidations * isort * deamon thread * remove threads * delete comment * tests * skip if hiredis available * async * review comments * docstring * decode test * fix test * fix decode response test

* Drop typing_extensions dependency (not necessary when targeting Python 3.8+) * Bump python_requires to >=3.8, drop importlib-metadata shim dependency * Cease testing on Python 3.7 * Add 3.8 test --------- Co-authored-by: dvora-h <[email protected]>

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@v2...v3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v4...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* sync * async * fixs connection mocks * fix async connection mock * fix test_asyncio/test_connection.py::test_single_connection * add test for cache blacklist and flushdb at the end of each test * fix review comments

* sync * fix mock_node_resp * fix mock_node_resp_func * fix test_handling_cluster_failover_to_a_replica * fix test_handling_cluster_failover_to_a_replica * async cluster and cleanup tests * delete comment

Co-authored-by: dvora-h <[email protected]>

* Adding lock_name to LockError * Adding lock_name to LockError --------- Co-authored-by: dvora-h <[email protected]>

* Fix objlen type hint * Update redis/commands/json/commands.py Co-authored-by: dvora-h <[email protected]> * linters --------- Co-authored-by: dvora-h <[email protected]>

* Update cluster.py When Executing "n.write()" may generate some unknown errors(e.g. DataError), which could result in the connection not being released. * Update cluster.py * Update cluster.py release connection move to "try...finally" * Update cluster.py fix the linters * fix problems of code review

…dd AbstractCache class (redis#3110) * CSC review fixes * cahnge cache_max_size default value * use ABC and add docstring

Co-authored-by: ahmedabdou14 <root@xps>

…nection raises an exception (redis#3133) Signed-off-by: zach.lee <[email protected]>

* Fixing typing for FCALL commands to match PEP 484 * Codestyle fixes * Fixes issue redis#3536

* fix(lock): raise LockNotOwnedError when release a lock from non-owned thread * change: error raise * fix: linter * fix(lock): async release --------- Co-authored-by: Vladyslav Vildanov <[email protected]>

…#3538) Bumps [rojopolis/spellcheck-github-actions](https://github.com/rojopolis/spellcheck-github-actions) from 0.38.0 to 0.47.0. - [Release notes](https://github.com/rojopolis/spellcheck-github-actions/releases) - [Changelog](https://github.com/rojopolis/spellcheck-github-actions/blob/master/CHANGELOG.md) - [Commits](rojopolis/spellcheck-github-actions@0.38.0...0.47.0) --- updated-dependencies: - dependency-name: rojopolis/spellcheck-github-actions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: petyaslavova <[email protected]>

…re provided and health check interval is configured (redis#3477)

* Replace flake8 + isort + flynt with ruff * Replace black with `ruff format`; run it

…float TTLs are honoured precisely (redis#3420)

…syncio decorator (redis#3542)

* (tests): Added testing for auth via DefaultAzureCredential * Added testing for async * Remove unused import

…#3458)

… after lock expiration (redis#3531) * adds option not to raise when leaving context manager after lock expiration * keep oroginal traceback Co-authored-by: Aarni Koskela <[email protected]> * improves error traceback * adds missing modifications * sort imports * run linter * adds catch for other possible exception * Update redis/lock.py to catch Both LockNotOwnedError and LockError in one except statement as LockError. Co-authored-by: Juliano Amadeu <[email protected]> * Update redis/asyncio/lock.py Co-authored-by: Juliano Amadeu <[email protected]> * fix linter errors --------- Co-authored-by: Aarni Koskela <[email protected]> Co-authored-by: petyaslavova <[email protected]>

…3551)

…edis#3474)

…luster_error_retry_attempts=0 (redis#3545)

Co-authored-by: Miro Hrončok <[email protected]>

Client.close() may call ConnectionPool.release() or ConnectionPool.disconnect(); both methods may end up calling os.getpid() (through ConnectionPool._checkpid() or threading.Lock() (through ConnectionPool.reset()). As mentioned in the Python documentation [1], at interpreter shutdown, module globals (in this case, the os and threading module references) may be deleted or set to None before __del__() methods are called. This causes an AttributeError to be raised when trying to run e.g. os.getpid(); while the error is ignored by the interpreter, the traceback is still printed out to stderr. Closes redis#3014 [1] https://docs.python.org/3/reference/datamodel.html#object.__del__ Co-authored-by: petyaslavova <[email protected]>

Signed-off-by: Joel Dice <[email protected]>

)

Signed-off-by: Joel Dice <[email protected]>

dicej force-pushed the no-ssl branch 4 times, most recently from 6daa3cd to ae2e1bd Compare December 18, 2023 17:09

dvora-h and others added 26 commits January 1, 2024 12:13

Client side caching invalidations (standalone) (redis#3089)

53de308

* cache invalidations * isort * deamon thread * remove threads * delete comment * tests * skip if hiredis available * async * review comments * docstring * decode test * fix test * fix decode response test

fix acl_genpass with bits (redis#3062)

6046d5f

Version 5.1.0b1 (redis#3093)

c6bbfca

Support client side caching with ConnectionPool (redis#3099)

8cbf7f5

* sync * async * fixs connection mocks * fix async connection mock * fix test_asyncio/test_connection.py::test_single_connection * add test for cache blacklist and flushdb at the end of each test * fix review comments

Version 5.1.0b2 (redis#3100)

b5d4d29

Support client side caching with RedisCluster (redis#3102)

c7a13ae

* sync * fix mock_node_resp * fix mock_node_resp_func * fix test_handling_cluster_failover_to_a_replica * fix test_handling_cluster_failover_to_a_replica * async cluster and cleanup tests * delete comment

Always sending codecov (redis#3101)

63932bb

filter commits for main branch (redis#3036)

902754b

fix(docs): organize cluster mode part of lua scripting (redis#3073)

f9b6a5e

Fix typing for HashCommand.hdel (redis#3029)

bd4ce15

Co-authored-by: dvora-h <[email protected]>

Adding lock_name to LockError (redis#3023)

18bb016

* Adding lock_name to LockError * Adding lock_name to LockError --------- Co-authored-by: dvora-h <[email protected]>

Fix objlen type hint (redis#2966)

fabc23e

* Fix objlen type hint * Update redis/commands/json/commands.py Co-authored-by: dvora-h <[email protected]> * linters --------- Co-authored-by: dvora-h <[email protected]>

Fix type hint of arbitrary argument lists (redis#2908)

4a66c1e

Fix: hset unexpectedly mutates the list passed to items (redis#3103)

273f032

Return a copy of the respnse from cache (redis#3106)

df29566

CSC Review Fixes - expose delete functions, rename attribute names, a…

562152b

…dd AbstractCache class (redis#3110) * CSC review fixes * cahnge cache_max_size default value * use ABC and add docstring

Update install_requires (redis#3109)

908f2a5

Version 5.1.0b3 (redis#3112)

0a82496

Add modules support to async RedisCluster (redis#3115)

70e2a13

Fix grammer in BlockingConnectionPool class documentation (redis#3120)

1a7d474

Co-authored-by: ahmedabdou14 <root@xps>

release already acquired connections on ClusterPipeline, when get_con…

2f88840

…nection raises an exception (redis#3133) Signed-off-by: zach.lee <[email protected]>

666romeo and others added 22 commits February 27, 2025 14:58

Add force_master_ip support to async Sentinel client (redis#3524)

dd0c492

Fixing typing for FCALL commands to match PEP 484 (redis#3537)

577b4ac

* Fixing typing for FCALL commands to match PEP 484 * Codestyle fixes * Fixes issue redis#3536

fix(lock): Fix LockError message when releasing a lock. (redis#3534)

2fb2f47

* fix(lock): raise LockNotOwnedError when release a lock from non-owned thread * change: error raise * fix: linter * fix(lock): async release --------- Co-authored-by: Vladyslav Vildanov <[email protected]>

Fix client_list with multiple client ids (redis#3539)

805848a

Fix connection health check for protocol != 2 when auth credentials a…

b9af374

…re provided and health check interval is configured (redis#3477)

Isolate redis-entraid dependency for tests (redis#3521)

5891109

Replace flake8+isort+black with ruff (redis#3147)

4122f7c

* Replace flake8 + isort + flynt with ruff * Replace black with `ruff format`; run it

Correct the typedef of lock.extend() to accept floats, and test that …

8314b7f

…float TTLs are honoured precisely (redis#3420)

Removing deprecated usage of forbid_global_loop=True in pytest.mark.a…

b8ba391

…syncio decorator (redis#3542)

(tests): Added testing for auth via DefaultAzureCredential (redis#3544)

601c1aa

* (tests): Added testing for auth via DefaultAzureCredential * Added testing for async * Remove unused import

Fix AttributeError when client.get_default_node() returns None (redis…

187d800

…#3458)

Got rid of time.time()- replacing it with time.monotonic(). (redis#…

d8b2afa

…3551)

allow more recent pyopenssl (redis#3541)

c9a277e

Fix redis#3464: Correct misleading exception_handler example in docs (r…

09b1376

…edis#3474)

Removing support for RedisGraph module. (redis#3548)

ac3b147

DOC-4736 added geo indexing examples (redis#3485)

e4b6de1

Fixing async cluster pipeline execution when client is created with c…

700a244

…luster_error_retry_attempts=0 (redis#3545)

Avoid the multiprocessing forkserver method (redis#3442)

ea01a30

Co-authored-by: Miro Hrončok <[email protected]>

skip ssl import if not available

1b61efd

Signed-off-by: Joel Dice <[email protected]>

dicej force-pushed the no-ssl branch from fb7f2b2 to 1b61efd Compare March 12, 2025 23:05

petyaslavova and others added 4 commits March 13, 2025 10:22

Increasing the operations-per-run for stale issues GH action (redis#3556

daf6655

)

Merge branch 'master' into no-ssl

247a091

Removing support for RedisGears module. (redis#3553)

922c689

address review feedback and fix lint errors

6e1411e

Signed-off-by: Joel Dice <[email protected]>

dicej force-pushed the no-ssl branch from 34628bc to 6e1411e Compare March 13, 2025 16:00

petyaslavova and others added 2 commits March 13, 2025 18:03

Merge branch 'master' into no-ssl

2ec117f

remove TYPE_CHECKING clause from ssl conditional

7a79a9f

Signed-off-by: Joel Dice <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

skip `ssl` import if not available #1

skip `ssl` import if not available #1

Uh oh!

dicej commented Dec 18, 2023

Uh oh!

Uh oh!

skip ssl import if not available #1

Are you sure you want to change the base?

skip ssl import if not available #1

Uh oh!

Conversation

dicej commented Dec 18, 2023

Pull Request check-list

Description of change

Uh oh!

Uh oh!

skip `ssl` import if not available #1

skip `ssl` import if not available #1