equal
deleted
inserted
replaced
2 from __future__ import print_function |
2 from __future__ import print_function |
3 |
3 |
4 import socket |
4 import socket |
5 import re |
5 import re |
6 import sslpsk |
6 import sslpsk |
|
7 import ssl |
7 import Pyro |
8 import Pyro |
8 from Pyro.core import PyroURI |
9 from Pyro.core import PyroURI |
9 from Pyro.protocol import _connect_socket,TCPConnection,PYROAdapter |
10 from Pyro.protocol import _connect_socket,TCPConnection,PYROAdapter |
10 from Pyro.errors import ConnectionDeniedError, ProtocolError |
11 from Pyro.errors import ConnectionDeniedError, ProtocolError |
11 from Pyro.util import Log |
12 from Pyro.util import Log |
61 |
62 |
62 _getProtocolAdapter = Pyro.protocol.getProtocolAdapter |
63 _getProtocolAdapter = Pyro.protocol.getProtocolAdapter |
63 def getProtocolAdapter(protocol): |
64 def getProtocolAdapter(protocol): |
64 if protocol in ('PYROPSK', 'PYROLOCPSK'): |
65 if protocol in ('PYROPSK', 'PYROLOCPSK'): |
65 return PYROPSKAdapter() |
66 return PYROPSKAdapter() |
66 _getProtocolAdapter(protocol) |
67 return _getProtocolAdapter(protocol) |
67 |
68 |
68 Pyro.protocol.getProtocolAdapter = getProtocolAdapter |
69 Pyro.protocol.getProtocolAdapter = getProtocolAdapter |
69 |
70 |
70 _processStringURI = Pyro.core.processStringURI |
71 _processStringURI = Pyro.core.processStringURI |
71 def processStringURI(URI): |
72 def processStringURI(URI): |