diff options
author | Maxime Buquet <pep@bouah.net> | 2021-12-28 18:35:11 +0100 |
---|---|---|
committer | Maxime Buquet <pep@bouah.net> | 2021-12-28 18:35:11 +0100 |
commit | 834ea8ed74865f323bd4ed79b1b698c348d9fd6f (patch) | |
tree | 5e0256f7a24d9274b47cdb930ec5ef134e42b722 | |
parent | 237405e3a0dc9681a9313a91d60bd93131705b96 (diff) | |
parent | 90662d148e8a756b9f7c69c8b7a6260ce54fc867 (diff) | |
download | slixmpp-834ea8ed74865f323bd4ed79b1b698c348d9fd6f.tar.gz slixmpp-834ea8ed74865f323bd4ed79b1b698c348d9fd6f.tar.bz2 slixmpp-834ea8ed74865f323bd4ed79b1b698c348d9fd6f.tar.xz slixmpp-834ea8ed74865f323bd4ed79b1b698c348d9fd6f.zip |
Merge branch 'path-ca-certs' into 'master'
Make Xmlstream.ca_certs an Optional[Path] instead of Optional[str]
See merge request poezio/slixmpp!176
-rw-r--r-- | slixmpp/xmlstream/xmlstream.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/slixmpp/xmlstream/xmlstream.py b/slixmpp/xmlstream/xmlstream.py index 256eb2dc..7c4283f2 100644 --- a/slixmpp/xmlstream/xmlstream.py +++ b/slixmpp/xmlstream/xmlstream.py @@ -33,6 +33,7 @@ import socket as Socket import ssl import weakref import uuid +from pathlib import Path from contextlib import contextmanager import xml.etree.ElementTree as ET @@ -161,7 +162,7 @@ class XMLStream(asyncio.BaseProtocol): #: #: On Mac OS X, certificates in the system keyring will #: be consulted, even if they are not in the provided file. - ca_certs: Optional[str] + ca_certs: Optional[Path] #: Path to a file containing a client certificate to use for #: authenticating via SASL EXTERNAL. If set, there must also |