djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extmod/webrepl: Fix setting password in foreground mode and factor code. 

The password was not being set when running in foreground mode.  Duplicate
code has been removed.
This commit is contained in:
iabdalkader 2022-05-14 15:00:20 +02:00 committed by Damien George
parent 5fa8ea1b8b
commit 6b6ceafe1a
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
extmod/webrepl/webrepl.py
View File

@ -59,24 +59,28 @@ def stop():
listen_s.close()
def start(port=8266, password=None):
def start(port=8266, password=None, accept_handler=accept_conn):
stop()
if password is None:
webrepl_pass = password
if webrepl_pass is None:
try:
import webrepl_cfg
_webrepl.password(webrepl_cfg.PASS)
setup_conn(port, accept_conn)
print("Started webrepl in normal mode")
webrepl_pass = webrepl_cfg.PASS
except:
print("WebREPL is not configured, run 'import webrepl_setup'")
_webrepl.password(webrepl_pass)
s = setup_conn(port, accept_handler)
if accept_handler is None:
print("Starting webrepl in foreground mode")
accept_conn(s)
elif password is None:
print("Started webrepl in normal mode")
else:
_webrepl.password(password)
setup_conn(port, accept_conn)
print("Started webrepl in manual override mode")
def start_foreground(port=8266):
stop()
s = setup_conn(port, None)
accept_conn(s)
def start_foreground(port=8266, password=None):
start(port, password, None)