aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2021-10-04 15:09:10 -0400
committerKevin O'Connor <kevin@koconnor.net>2021-10-04 15:10:46 -0400
commitcc63fd51b226f86aa684342241c20e2e2b84f8da (patch)
tree2eaef79a5a6cd96e536000518901cdef568c8490
parent41d42a07bf2ad23762dac02b615865efa86adfec (diff)
downloadkutter-cc63fd51b226f86aa684342241c20e2e2b84f8da.tar.gz
kutter-cc63fd51b226f86aa684342241c20e2e2b84f8da.tar.xz
kutter-cc63fd51b226f86aa684342241c20e2e2b84f8da.zip
scripts: Use backport of a recent Python3 configparser on Python2
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
-rw-r--r--klippy/util.py8
-rw-r--r--scripts/klippy-requirements.txt1
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