Mercurial > p > roundup > code
annotate roundup/anypy/html.py @ 6582:3e8f2104753b
issue2551186 - replace socket.sslerror in mailgw.py.
roundup/mailgw.py:
replaced socket.sslerror with anypy/ssl_.SSLError
also looks like a socket.sslerror was removed from pops handling.
added it back using method above.
roundupanypy/ssl_.py:
defines replacement SSLError suitable for python2 or 3
tested by running nc -lp 995 or 993 (pop3s/imaps) and sending
gibberish when mailgw connects. This generates a bad version number
SSLError.
I need to get my imap and pop mock servers included for testing at
some point, but I am not sure how to make them bind to the right port
as they are priv ports.
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Tue, 04 Jan 2022 18:39:40 -0500 |
| parents | ff57db595a58 |
| children | 7f888f046857 |
| 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 |
|
5837
883c9e90b403
Fix problem with cgi.escape being depricated a different way. This way
John Rouillard <rouilj@ieee.org>
parents:
diff
changeset
|
4 def html_escape(str, quote=False): |
|
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 |
|
883c9e90b403
Fix problem with cgi.escape being depricated a different way. This way
John Rouillard <rouilj@ieee.org>
parents:
diff
changeset
|
7 return html_escape_(str, quote=quote) |
|
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 |