beremiz

WAMP: python2 backport fixes
py2compat
14 months ago, Edouard Tisserant
7c2ef36d3606
Parents 48cb67922dd2
Children 3e6ca3f13c30
WAMP: python2 backport fixes
2 files changed, 2 insertions(+), 3 deletions(-)
  • +0 -1
    runtime/NevowServer.py
  • +2 -2
    runtime/WampClient.py
    • --- a/runtime/NevowServer.py Tue Mar 25 14:32:37 2025 +0100
    +++ b/runtime/NevowServer.py Tue Mar 25 16:06:35 2025 +0100
    @@ -185,7 +185,6 @@
    child_webform_css = webform.defaultCSS
    child_webinterface_css = File(paths.AbsNeighbourFile(__file__, 'webinterface.css'), 'text/css')
    -@implementer(ISettings)
    class SettingsPage(StyledSettingsPage):
    implements(ISettings)
    --- a/runtime/WampClient.py Tue Mar 25 14:32:37 2025 +0100
    +++ b/runtime/WampClient.py Tue Mar 25 16:06:35 2025 +0100
    @@ -132,7 +132,7 @@
    accepted_method = "anonymous"
    authID = None
    else:
    - authID = self.config.extra["ID"]
    + authID = unicode(self.config.extra["ID"])
    if auth == AUTH_PSK:
    accepted_method = "wampcra"
    elif auth in SSL_AUTHENTICATION_TYPES:
    @@ -141,7 +141,7 @@
    raise Exception("Invalid authentication: "+auth)
    self.join(self.config.realm,
    - authmethods=[accepted_method],
    + authmethods=[unicode(accepted_method)],
    authid=authID)
    def onChallenge(self, challenge):