diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2017-08-09 23:25:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-09 23:25:10 +0200 |
| commit | bb0ab45348933e46248a06baf00bdb1bd4f4b382 (patch) | |
| tree | e3aa1f3dbf9359b74f75e3717579c8bfadf7b89a | |
| parent | 802e8cb34105ac7464838fc57ba2294428f9d3c2 (diff) | |
| parent | a4048c8871b12a0632423f49af4f749e4968d36b (diff) | |
| download | mitmproxy-bb0ab45348933e46248a06baf00bdb1bd4f4b382.tar.gz mitmproxy-bb0ab45348933e46248a06baf00bdb1bd4f4b382.tar.bz2 mitmproxy-bb0ab45348933e46248a06baf00bdb1bd4f4b382.zip | |
Merge pull request #2509 from ujjwal96/compat
Fixes #2495
| -rw-r--r-- | mitmproxy/io/compat.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mitmproxy/io/compat.py b/mitmproxy/io/compat.py index 99da496d..da9d2a44 100644 --- a/mitmproxy/io/compat.py +++ b/mitmproxy/io/compat.py @@ -58,7 +58,7 @@ def convert_017_018(data): # convert_unicode needs to be called for every dual release and the first py3-only release data = convert_unicode(data) - data["server_conn"]["ip_address"] = data["server_conn"].pop("peer_address") + data["server_conn"]["ip_address"] = data["server_conn"].pop("peer_address", None) data["marked"] = False data["version"] = (0, 18) return data |