pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: Improved handling of data coming in from the printer

Browse source 
Hopefully closes #829
This commit is contained in:
Gina Häußge 2015-03-30 13:15:52 +02:00
parent 2fa0673e0b
commit 79336ca108
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/octoprint/util/__init__.py
View file

@ -389,7 +389,11 @@ def silent_remove(file):
def sanitize_ascii(line):
return unicode(line, 'ascii', 'replace').encode('ascii', 'replace').rstrip()
if not isinstance(line, basestring):
raise ValueError("Expected either str or unicode but got {} instead".format(line.__class__.__name__ if line is not None else None))
if isinstance(line, str):
line = unicode(line, 'ascii', 'replace')
return line.encode('ascii', 'replace').rstrip()
def filter_non_ascii(line):

8
src/octoprint/util/comm.py
View file

@ -1250,7 +1250,13 @@ class MachineCom(object):
if ret == '':
#self._log("Recv: TIMEOUT")
return ''
self._log("Recv: %s" % sanitize_ascii(ret))
try:
self._log("Recv: %s" % sanitize_ascii(ret))
except ValueError as e:
self._log("WARN: While reading last line: %s" % e)
self._log("Recv: %r" % ret)
return ret
def _getNext(self):