diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-10-08 12:43:55 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-10-08 12:43:55 +0200 |
| commit | 7d8191ee37a4e085d23217f85e41f4da4c9e4069 (patch) | |
| tree | dc7642c64a2c65b65bf8a995e12e918b0c97c607 /libmproxy/models | |
| parent | 442f079e0b4e715897318f378f8a08d7f2271990 (diff) | |
| download | mitmproxy-7d8191ee37a4e085d23217f85e41f4da4c9e4069.tar.gz mitmproxy-7d8191ee37a4e085d23217f85e41f4da4c9e4069.tar.bz2 mitmproxy-7d8191ee37a4e085d23217f85e41f4da4c9e4069.zip | |
update web builds, use watchify
Diffstat (limited to 'libmproxy/models')
| -rw-r--r-- | libmproxy/models/connections.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmproxy/models/connections.py b/libmproxy/models/connections.py index 95ffbaf6..ec089471 100644 --- a/libmproxy/models/connections.py +++ b/libmproxy/models/connections.py @@ -51,9 +51,9 @@ class ClientConnection(tcp.BaseHandler, stateobject.StateObject): def get_state(self, short=False): d = super(ClientConnection, self).get_state(short) d.update( - address={ + address=({ "address": self.address(), - "use_ipv6": self.address.use_ipv6}, + "use_ipv6": self.address.use_ipv6} if self.address else {}), clientcert=self.cert.to_pem() if self.clientcert else None) return d @@ -136,7 +136,7 @@ class ServerConnection(tcp.TCPClient, stateobject.StateObject): d = super(ServerConnection, self).get_state(short) d.update( address=({"address": self.address(), - "use_ipv6": self.address.use_ipv6} if self.address else {}), + "use_ipv6": self.address.use_ipv6} if self.address else {}), source_address=({"address": self.source_address(), "use_ipv6": self.source_address.use_ipv6} if self.source_address else None), cert=self.cert.to_pem() if self.cert else None |