Skip to content

Commit 5708c69

Browse files
committed
Merge pull request esp8266#1492 from asdwsda/master
make espota compatible with python 3.5
2 parents 6aa7da4 + 6408e43 commit 5708c69

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

tools/espota.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ def serve(remoteAddr, localAddr, remotePort, localPort, password, filename, comm
9292
logging.info('Sending invitation to: %s', remoteAddr)
9393
sock2 = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
9494
remote_address = (remoteAddr, int(remotePort))
95-
sent = sock2.sendto(message, remote_address)
95+
sent = sock2.sendto(message.encode(), remote_address)
9696
sock2.settimeout(10)
9797
try:
98-
data = sock2.recv(37)
98+
data = sock2.recv(37).decode()
9999
except:
100100
logging.error('No Answer')
101101
sock2.close()
@@ -111,10 +111,10 @@ def serve(remoteAddr, localAddr, remotePort, localPort, password, filename, comm
111111
sys.stderr.write('Authenticating...')
112112
sys.stderr.flush()
113113
message = '%d %s %s\n' % (AUTH, cnonce, result)
114-
sock2.sendto(message, remote_address)
114+
sock2.sendto(message.encode(), remote_address)
115115
sock2.settimeout(10)
116116
try:
117-
data = sock2.recv(32)
117+
data = sock2.recv(32).decode()
118118
except:
119119
sys.stderr.write('FAIL\n')
120120
logging.error('No Answer to our Authentication')
@@ -173,7 +173,7 @@ def serve(remoteAddr, localAddr, remotePort, localPort, password, filename, comm
173173
logging.info('Waiting for result...')
174174
try:
175175
connection.settimeout(60)
176-
data = connection.recv(32)
176+
data = connection.recv(32).decode()
177177
logging.info('Result: %s' ,data)
178178
connection.close()
179179
f.close()

0 commit comments

Comments
 (0)