Skip to content

websocket-client compatibility fix #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vstruk wants to merge 2 commits into
base: master
Choose a base branch
from
Open

websocket-client compatibility fix #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b61682
Websocket connectivity didn't work with the current websocket-client.
vstruk Nov 1, 2018
b6a0ea5
Logging fixed
vstruk Nov 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions mp/conwebsock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def __init__(self, ip, password):
self.fifo = deque()
self.fifo_lock = threading.Lock()

# websocket.enableTrace(logging.root.getEffectiveLevel() < logging.INFO)
websocket.enableTrace(logging.root.getEffectiveLevel() < logging.INFO)
self.ws = websocket.WebSocketApp("ws://%s:8266" % ip,
on_message=self.on_message,
on_error=self.on_error,
Expand All @@ -71,23 +71,23 @@ def run(self):
def __del__(self):
self.close()

def on_message(self, ws, message):
Copy link
Copy Markdown
Collaborator

@skorokithakis skorokithakis Dec 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The websocket-client README indicates that this argument is still used, why the discrepancy?

Copy link
Copy Markdown
Author

@vstruk vstruk Dec 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe documentation is outdated

Copy link
Copy Markdown
Collaborator

@skorokithakis skorokithakis Dec 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that they do, indeed, pass two arguments. Which version have you tested your code with?

def on_message(self, message):
self.fifo.extend(message)

try:
self.fifo_lock.release()
except:
pass

def on_error(self, ws, error):
def on_error(self, error):
logging.error("websocket error: %s" % error)

try:
self.fifo_lock.release()
except:
pass

def on_close(self, ws):
def on_close(self):
logging.info("websocket closed")

try:
Expand Down
2 changes: 1 addition & 1 deletion mp/mpfshell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ def main():
if args.logfile is not None:
logging.basicConfig(format=format, filename=args.logfile,level=args.loglevel)
else:
logging.basicConfig(format=format, level=logging.CRITICAL)
logging.basicConfig(format=format, level=args.loglevel)

logging.info('Micropython File Shell v%s started' % version.FULL)
logging.info('Running on Python %d.%d using PySerial %s' \
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pyserial ~= 2.7
colorama ~= 0.3.6
websocket_client ~= 0.35.0
websocket_client ~= 0.53.0