summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2022-02-04 23:07:00 +0100
committermathieui <mathieui@mathieui.net>2022-02-04 23:07:00 +0100
commitd5502c9be70c850a6c4d2dcf1f7cca672c4da6a0 (patch)
tree1635030b5b9eb9ba544e49a236f4de0ad245de54
parent33efbd4d7bb1f6d77ee5cb55684bebc56ffc2eb8 (diff)
parent9f38c8944d5be891077145e4585734921f31b444 (diff)
downloadslixmpp-d5502c9be70c850a6c4d2dcf1f7cca672c4da6a0.tar.gz
slixmpp-d5502c9be70c850a6c4d2dcf1f7cca672c4da6a0.tar.bz2
slixmpp-d5502c9be70c850a6c4d2dcf1f7cca672c4da6a0.tar.xz
slixmpp-d5502c9be70c850a6c4d2dcf1f7cca672c4da6a0.zip
Merge branch 'ca-cert-compat' into 'master'
Don't break ca-bundle API just yet See merge request poezio/slixmpp!178
-rw-r--r--slixmpp/xmlstream/xmlstream.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/slixmpp/xmlstream/xmlstream.py b/slixmpp/xmlstream/xmlstream.py
index fd0269da..82611bfd 100644
--- a/slixmpp/xmlstream/xmlstream.py
+++ b/slixmpp/xmlstream/xmlstream.py
@@ -771,6 +771,9 @@ class XMLStream(asyncio.BaseProtocol):
self.certfile, self.keyfile)
if self.ca_certs is not None:
ca_cert: Optional[Path] = None
+ # XXX: Compat before d733c54518.
+ if isinstance(self.ca_certs, str):
+ self.ca_certs = Path(self.ca_certs)
if isinstance(self.ca_certs, Path):
if self.ca_certs.is_file():
ca_cert = self.ca_certs