CreatBot/CreatBotKlipper
CreatBot/CreatBotKlipper
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtual_sdcard: Fix handling of unicode characters on Python2

Browse Source 
Commit 600e89ae fixed unicode handling on Python3, but broke Python2
support.  Use an alternate implementation that should work for both
Python3 and Python2.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2024-03-21 22:10:27 -04:00
parent 0aacbc3973
commit 9e1cbdcee3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
klippy/extras/virtual_sdcard.py
View File

@ -1,9 +1,9 @@
# Virtual sdcard support (print files directly from a host g-code file)
#
# Copyright (C) 2018 Kevin O'Connor <kevin@koconnor.net>
# Copyright (C) 2018-2024 Kevin O'Connor <kevin@koconnor.net>
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import os, logging, io
import os, sys, logging, io
VALID_GCODE_EXTS = ['gcode', 'g', 'gco']
@ -258,7 +258,10 @@ class VirtualSD:
# Dispatch command
self.cmd_from_sd = True
line = lines.pop()
next_file_position = self.file_position + len(line.encode()) + 1
if sys.version_info.major >= 3:
next_file_position = self.file_position + len(line.encode()) + 1
else:
next_file_position = self.file_position + len(line) + 1
self.next_file_position = next_file_position
try:
self.gcode.run_script(line)