annotate roundup/anypy/html.py @ 7968:d7e79f8eb943

issue2551350 - Python changes for 3.12 with roundup 2.3.0 mailer.py Fix due to change in smtplib.SMTP.starttls() signature. As of 3.3 it can use an optional ssl context argument for certificates/keys. In 3.12 it dropped legacy support for specifing cert/key files as arguments and requires a context. I modified Andrew's original patch to initialize SSLContext with ssl.PROTOCOL_TLS_CLIENT. If there is a cert file specified, enable check_hostname - verify that the cert supplied by the server matches the hostname we supplied. If there is no cert file call load_default_certs() Also opened issue2551351 to look into more SMTP ssmtp tightening. We also should have an option in Roundup to use TLS/SSL (smtps) without using starttls. Note that this code is untested by the test suite due to the need to setup an SMTP server with STARTTLS support. issue2551351 has some notes on this.
author John Rouillard <rouilj@ieee.org>
date Wed, 15 May 2024 00:08:05 -0400
parents 7f888f046857
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5837
883c9e90b403 Fix problem with cgi.escape being depricated a different way. This way
John Rouillard <rouilj@ieee.org>
parents:
diff changeset
1 try:
6027
ff57db595a58 flake8 cleanups whitespace formatting only.
John Rouillard <rouilj@ieee.org>
parents: 5837
diff changeset
2 from html import escape as html_escape_ # python 3
ff57db595a58 flake8 cleanups whitespace formatting only.
John Rouillard <rouilj@ieee.org>
parents: 5837
diff changeset
3
7769
7f888f046857 chore: ruff lint: replace str variable name with string
John Rouillard <rouilj@ieee.org>
parents: 6027
diff changeset
4 def html_escape(string, quote=False):
5837
883c9e90b403 Fix problem with cgi.escape being depricated a different way. This way
John Rouillard <rouilj@ieee.org>
parents:
diff changeset
5 # html_escape under python 3 sets quote to true by default
883c9e90b403 Fix problem with cgi.escape being depricated a different way. This way
John Rouillard <rouilj@ieee.org>
parents:
diff changeset
6 # make it python 2 compatible
7769
7f888f046857 chore: ruff lint: replace str variable name with string
John Rouillard <rouilj@ieee.org>
parents: 6027
diff changeset
7 return html_escape_(string, quote=quote)
5837
883c9e90b403 Fix problem with cgi.escape being depricated a different way. This way
John Rouillard <rouilj@ieee.org>
parents:
diff changeset
8 except ImportError:
6027
ff57db595a58 flake8 cleanups whitespace formatting only.
John Rouillard <rouilj@ieee.org>
parents: 5837
diff changeset
9 # python 2 fallback
ff57db595a58 flake8 cleanups whitespace formatting only.
John Rouillard <rouilj@ieee.org>
parents: 5837
diff changeset
10 from cgi import escape as html_escape # noqa: F401

Roundup Issue Tracker: http://roundup-tracker.org/