Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-22 15:37:45 +00:00
Code Issues Projects Releases Wiki Activity

fix #956

Browse Source
This commit is contained in:
Maximilian Hils 2016-02-19 00:30:37 +01:00
parent ecb26c3c82
commit 2bec6a35e2
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netlib/tcp.py
View File

@ -355,9 +355,6 @@ class Address(utils.Serializable):
def __repr__(self):
return "{}:{}".format(self.host, self.port)
def __str__(self):
return str(self.address)
def __eq__(self, other):
if not other:
return False
@ -698,8 +695,7 @@ class TCPClient(_Connection):
if self.source_address:
connection.bind(self.source_address())
connection.connect(self.address())
if not self.source_address:
self.source_address = Address(connection.getsockname())
self.source_address = Address(connection.getsockname())
except (socket.error, IOError) as err:
raise TcpException(
'Error connecting to "%s": %s' %

10
test/netlib/test_tcp.py
View File

@ -748,17 +748,15 @@ class TestPeekSSL(TestPeek):
class TestAddress:
def test_simple(self):
a = tcp.Address("localhost", True)
a = tcp.Address(("localhost", 80), True)
assert a.use_ipv6
b = tcp.Address("foo.com", True)
b = tcp.Address(("foo.com", 80), True)
assert not a == b
assert str(b) == str(tuple("foo.com"))
c = tcp.Address("localhost", True)
c = tcp.Address(("localhost", 80), True)
assert a == c
assert not a != c
assert repr(a)
assert repr(a) == "localhost:80"
class TestSSLKeyLogger(tservers.ServerTestBase):