aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2017-05-24 11:11:45 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2017-05-24 11:35:53 +0200
commit485ac4aa324d7e70d5e6d1a789bb0ac8257a362e (patch)
treef8644966ade3e23a32c5263a14114debde753179
parente82ed55516fbbba252b6dbfede49745eeea9e269 (diff)
downloadmitmproxy-485ac4aa324d7e70d5e6d1a789bb0ac8257a362e.tar.gz
mitmproxy-485ac4aa324d7e70d5e6d1a789bb0ac8257a362e.tar.bz2
mitmproxy-485ac4aa324d7e70d5e6d1a789bb0ac8257a362e.zip
fix array.{fromstring,tostring} deprecation warning
-rw-r--r--mitmproxy/net/socks.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mitmproxy/net/socks.py b/mitmproxy/net/socks.py
index 570a4afb..fdfcfb80 100644
--- a/mitmproxy/net/socks.py
+++ b/mitmproxy/net/socks.py
@@ -82,12 +82,12 @@ class ClientGreeting:
client_greeting = cls(ver, [])
if fail_early:
client_greeting.assert_socks5()
- client_greeting.methods.fromstring(f.safe_read(nmethods))
+ client_greeting.methods.frombytes(f.safe_read(nmethods))
return client_greeting
def to_file(self, f):
f.write(struct.pack("!BB", self.ver, len(self.methods)))
- f.write(self.methods.tostring())
+ f.write(self.methods.tobytes())
class ServerGreeting: