beremiz

runtime web settings: fix more python2 to 3 porting problems

15 months ago, Edouard Tisserant
d47ccfb0a107
Parents 3dbbf5f237fb
Children a6c6d5c30788
runtime web settings: fix more python2 to 3 porting problems
3 files changed, 4 insertions(+), 4 deletions(-)
  • +1 -1
    requirements.txt
  • +2 -2
    runtime/NevowServer.py
  • +1 -1
    runtime/WampClient.py
    • --- a/requirements.txt Mon Mar 24 15:13:16 2025 +0100
    +++ b/requirements.txt Mon Mar 24 15:14:36 2025 +0100
    @@ -21,7 +21,7 @@
    lxml==5.3.1
    matplotlib==3.10.1
    msgpack==1.1.0
    -Nevow @ git+https://git@github.com/beremiz/nevow-py3.git@91e423c3803ea8d4ef7dacdde4fa88ce1d03c6c1
    +Nevow @ git+https://git@github.com/beremiz/nevow-py3.git@fe14898bc3e8aaa2ff982b6fb07c76c3b0bec77d
    numpy==2.2.3
    packaging==24.2
    pillow==11.1.0
    --- a/runtime/NevowServer.py Mon Mar 24 15:13:16 2025 +0100
    +++ b/runtime/NevowServer.py Mon Mar 24 15:14:36 2025 +0100
    @@ -224,9 +224,9 @@
    return ConfigurableSettings
    def sendLogMessage(self, level, message, **kwargs):
    - level = LogLevelsDict[level]
    + level = LogLevelsDict[level.decode()]
    GetPLCObjectSingleton().LogMessage(
    - level, "Web form log message: " + message)
    + level, "Web form log message: " + message.decode())
    def restartOrRepairPLC(self, action, **kwargs):
    if(action == "Repair"):
    --- a/runtime/WampClient.py Mon Mar 24 15:13:16 2025 +0100
    +++ b/runtime/WampClient.py Mon Mar 24 15:14:36 2025 +0100
    @@ -539,7 +539,7 @@
    tmpConf = newConfig
    while argname_path:
    tmpConf = tmpConf.setdefault(argname_path.pop(0), {})
    - tmpConf[arg_last] = arg
    + tmpConf[arg_last] = arg.decode() if type(arg)==bytes else arg
    SetConfiguration(newConfig)