arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-05-08 05:41:40 +03:00
Code

make espota compatible with python 3.5

Browse Source
This commit is contained in:
Peter Szabo 2016-01-24 21:11:23 +01:00
parent bc82547ddd
commit 6408e43331
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/espota.py
View File

@ -92,10 +92,10 @@ def serve(remoteAddr, localAddr, remotePort, localPort, password, filename, comm
logging.info('Sending invitation to: %s', remoteAddr) logging.info('Sending invitation to: %s', remoteAddr)
sock2 = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) sock2 = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
remote_address = (remoteAddr, int(remotePort)) remote_address = (remoteAddr, int(remotePort))
sent = sock2.sendto(message, remote_address) sent = sock2.sendto(message.encode(), remote_address)
sock2.settimeout(10) sock2.settimeout(10)
try: try:
data = sock2.recv(37) data = sock2.recv(37).decode()
except: except:
logging.error('No Answer') logging.error('No Answer')
sock2.close() sock2.close()
@ -111,10 +111,10 @@ def serve(remoteAddr, localAddr, remotePort, localPort, password, filename, comm
sys.stderr.write('Authenticating...') sys.stderr.write('Authenticating...')
sys.stderr.flush() sys.stderr.flush()
message = '%d %s %s\n' % (AUTH, cnonce, result) message = '%d %s %s\n' % (AUTH, cnonce, result)
sock2.sendto(message, remote_address) sock2.sendto(message.encode(), remote_address)
sock2.settimeout(10) sock2.settimeout(10)
try: try:
data = sock2.recv(32) data = sock2.recv(32).decode()
except: except:
sys.stderr.write('FAIL\n') sys.stderr.write('FAIL\n')
logging.error('No Answer to our Authentication') logging.error('No Answer to our Authentication')
@ -173,7 +173,7 @@ def serve(remoteAddr, localAddr, remotePort, localPort, password, filename, comm
logging.info('Waiting for result...') logging.info('Waiting for result...')
try: try:
connection.settimeout(60) connection.settimeout(60)
data = connection.recv(32) data = connection.recv(32).decode()
logging.info('Result: %s' ,data) logging.info('Result: %s' ,data)
connection.close() connection.close()
f.close() f.close()