3D-printing/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-07-15 18:58:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

klippy: Add Python2 module wrappers and use Python3 module naming

Browse source 
Add wrappers for some common Python modules so that the code can run
on both Python2 and Python3.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2021-10-01 19:30:48 -04:00
parent b8c91914b7
commit f1747b5118
6 changed files with 29 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
klippy/configfile.py
View file

@ -3,7 +3,7 @@
# Copyright (C) 2016-2021 Kevin O'Connor <kevin@koconnor.net>
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import os, glob, re, time, logging, ConfigParser as configparser, StringIO
import os, glob, re, time, logging, configparser, io
error = configparser.Error
@ -211,7 +211,7 @@ class PrinterConfig:
return
data = '\n'.join(buffer)
del buffer[:]
sbuffer = StringIO.StringIO(data)
sbuffer = io.StringIO(data)
fileconfig.readfp(sbuffer, filename)
def _resolve_include(self, source_filename, include_spec, fileconfig,
visited):
@ -255,11 +255,11 @@ class PrinterConfig:
self._parse_config_buffer(buffer, filename, fileconfig)
visited.remove(path)
def _build_config_wrapper(self, data, filename):
fileconfig = configparser.RawConfigParser()
fileconfig = configparser.RawConfigParser(strict=False)
self._parse_config(data, filename, fileconfig, set())
return ConfigWrapper(self.printer, fileconfig, {}, 'printer')
def _build_config_string(self, config):
sfile = StringIO.StringIO()
sfile = io.StringIO()
config.fileconfig.write(sfile)
return sfile.getvalue().strip()
def read_config(self, filename):