From cc63fd51b226f86aa684342241c20e2e2b84f8da Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Mon, 4 Oct 2021 15:09:10 -0400 Subject: [PATCH] scripts: Use backport of a recent Python3 configparser on Python2 Signed-off-by: Kevin O'Connor --- klippy/util.py | 8 +------- scripts/klippy-requirements.txt | 1 + 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/klippy/util.py b/klippy/util.py index 6d110e47..eabd2263 100644 --- a/klippy/util.py +++ b/klippy/util.py @@ -98,16 +98,10 @@ def setup_python2_wrappers(): if sys.version_info.major >= 3: return # Add module hacks so that common Python3 module imports work in Python2 - import Queue, io, StringIO, ConfigParser, time + import Queue, io, StringIO, time sys.modules["queue"] = Queue io.StringIO = StringIO.StringIO time.process_time = time.clock - sys.modules["configparser"] = ConfigParser - OrigRawConfigParser = ConfigParser.RawConfigParser - def RCP(strict=False, *args, **kwargs): - return OrigRawConfigParser(*args, **kwargs) - RCP.SECTCRE = OrigRawConfigParser.SECTCRE - ConfigParser.RawConfigParser = RCP setup_python2_wrappers() diff --git a/scripts/klippy-requirements.txt b/scripts/klippy-requirements.txt index 77c2b8ef..bdc431ed 100644 --- a/scripts/klippy-requirements.txt +++ b/scripts/klippy-requirements.txt @@ -7,3 +7,4 @@ pyserial==3.4 greenlet==1.1.2 Jinja2==2.11.3 python-can==3.3.4 +configparser==4.0.2