Mercurial > p > roundup > code
annotate roundup/anypy/xmlrpc_.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 | 99d4fb22aa65 |
| children | 7b33365ccb2a |
| rev | line source |
|---|---|
|
5408
e46ce04d5bbc
Python 3 preparation: update xmlrpclib / SimpleXMLRPCServer imports.
Joseph Myers <jsm@polyomino.org.uk>
parents:
diff
changeset
|
1 try: |
|
e46ce04d5bbc
Python 3 preparation: update xmlrpclib / SimpleXMLRPCServer imports.
Joseph Myers <jsm@polyomino.org.uk>
parents:
diff
changeset
|
2 # Python 3+. |
|
e46ce04d5bbc
Python 3 preparation: update xmlrpclib / SimpleXMLRPCServer imports.
Joseph Myers <jsm@polyomino.org.uk>
parents:
diff
changeset
|
3 from xmlrpc import client, server |
|
5552
db10c0a1f338
Fix xmlrpc module selection for incomplete backport (issue2551010).
Gabi <gabriele.roeger@unibas.ch>
parents:
5408
diff
changeset
|
4 server.SimpleXMLRPCDispatcher |
|
db10c0a1f338
Fix xmlrpc module selection for incomplete backport (issue2551010).
Gabi <gabriele.roeger@unibas.ch>
parents:
5408
diff
changeset
|
5 except (ImportError, AttributeError): |
|
5408
e46ce04d5bbc
Python 3 preparation: update xmlrpclib / SimpleXMLRPCServer imports.
Joseph Myers <jsm@polyomino.org.uk>
parents:
diff
changeset
|
6 # Python 2. |
|
6049
99d4fb22aa65
flake8 fixes: ignore import unused in python3.
John Rouillard <rouilj@ieee.org>
parents:
5552
diff
changeset
|
7 import xmlrpclib as client # noqa: F401 |
|
5408
e46ce04d5bbc
Python 3 preparation: update xmlrpclib / SimpleXMLRPCServer imports.
Joseph Myers <jsm@polyomino.org.uk>
parents:
diff
changeset
|
8 import SimpleXMLRPCServer as server |