diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2015-06-01 12:32:03 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2015-06-01 12:32:03 +1200 |
| commit | 7439e244a6ac0bc5ef4ffcbfbf312b91373de0ef (patch) | |
| tree | a4131e57c04eef26db39c57e79a69899f6e06069 /libmproxy | |
| parent | 50df036db5bd38a2639955674726a70cc643f32d (diff) | |
| parent | c28cc6fe96becc3dae860f0abca4b00149372743 (diff) | |
| download | mitmproxy-7439e244a6ac0bc5ef4ffcbfbf312b91373de0ef.tar.gz mitmproxy-7439e244a6ac0bc5ef4ffcbfbf312b91373de0ef.tar.bz2 mitmproxy-7439e244a6ac0bc5ef4ffcbfbf312b91373de0ef.zip | |
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/platform/windows.py | 2 | ||||
| -rw-r--r-- | libmproxy/tnetstring.py | 4 | ||||
| -rw-r--r-- | libmproxy/web/app.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libmproxy/platform/windows.py b/libmproxy/platform/windows.py index 5133d056..09a4422f 100644 --- a/libmproxy/platform/windows.py +++ b/libmproxy/platform/windows.py @@ -371,7 +371,7 @@ class TransparentProxy(object): if server: packet.src_addr, packet.src_port = server else: - print "Warning: Previously unseen connection from proxy to %s:%s." % client + print("Warning: Previously unseen connection from proxy to %s:%s." % client) packet = self.driver.update_packet_checksums(packet) self.response_handle.send((packet.raw, metadata)) diff --git a/libmproxy/tnetstring.py b/libmproxy/tnetstring.py index bed8405f..c5c185c6 100644 --- a/libmproxy/tnetstring.py +++ b/libmproxy/tnetstring.py @@ -60,10 +60,10 @@ By default tnetstrings work only with byte strings, not unicode. If you want unicode strings then pass an optional encoding to the various functions, like so:: - >>> print repr(tnetstring.loads("2:\\xce\\xb1,")) + >>> print(repr(tnetstring.loads("2:\\xce\\xb1,"))) '\\xce\\xb1' >>> - >>> print repr(tnetstring.loads("2:\\xce\\xb1,","utf8")) + >>> print(repr(tnetstring.loads("2:\\xce\\xb1,","utf8"))) u'\u03b1' """ diff --git a/libmproxy/web/app.py b/libmproxy/web/app.py index 69341e76..29ae9e7a 100644 --- a/libmproxy/web/app.py +++ b/libmproxy/web/app.py @@ -232,7 +232,7 @@ class Settings(RequestHandler): self.state.set_intercept(v) update[k] = v else: - print "Warning: Unknown setting {}: {}".format(k, v) + print("Warning: Unknown setting {}: {}".format(k, v)) ClientConnection.broadcast( type="settings", |