beremiz

WAMP: make latest changes compatible with python2/wxpython3
py2compat
14 months ago, Edouard Tisserant
48cb67922dd2
Parents e33d5c790b3e
Children 7c2ef36d3606
WAMP: make latest changes compatible with python2/wxpython3
3 files changed, 12 insertions(+), 10 deletions(-)
  • +1 -1
    CertManagement.py
  • +4 -4
    connectors/WAMP/__init__.py
  • +7 -5
    controls/OwnIdentityPanel.py
    • --- a/CertManagement.py Tue Mar 25 14:31:18 2025 +0100
    +++ b/CertManagement.py Tue Mar 25 14:32:37 2025 +0100
    @@ -193,7 +193,7 @@
    except x509.extensions.ExtensionNotFound:
    info += "No SubjectAltName\n"
    - info += "Fingerprint: %s\n"%cert.fingerprint(hashes.SHA256()).hex()
    + info += "Fingerprint: %s\n"%"".join([hex(ord(c)).translate(None,'x')[-2:] for c in cert.fingerprint(hashes.SHA256())])
    info += "Creation date: %s\n"%cert.not_valid_before.isoformat()
    info += "Expiration date: %s\n"%cert.not_valid_after.isoformat()
    except OpenSSL.crypto.Error:
    --- a/connectors/WAMP/__init__.py Tue Mar 25 14:31:18 2025 +0100
    +++ b/connectors/WAMP/__init__.py Tue Mar 25 14:32:37 2025 +0100
    @@ -65,7 +65,7 @@
    accepted_method = "anonymous"
    authID = None
    else:
    - authID = self.config.extra["IDE_ID"]
    + authID = unicode(self.config.extra["IDE_ID"])
    if auth == AUTH_PSK:
    accepted_method = "wampcra"
    elif auth in SSL_AUTHENTICATION_TYPES:
    @@ -76,7 +76,7 @@
    return
    self.join(self.config.realm,
    - authmethods=[accepted_method],
    + authmethods=[unicode(accepted_method)],
    authid=authID)
    def onChallenge(self, challenge):
    @@ -184,7 +184,7 @@
    # create a WAMP application session factory
    session_factory = wamp.ApplicationSessionFactory(
    config=types.ComponentConfig(
    - realm=str(realm),
    + realm=text(realm),
    extra=extraconf))
    session_factory.session = cls
    @@ -212,7 +212,7 @@
    open(trust_store, 'rb').read())
    trustRoot = OpenSSLCertificateAuthorities([cert])
    if verify or ssl_auth:
    - contextFactory=optionsForClientTLS(transport_factory.host,
    + contextFactory=optionsForClientTLS(text(transport_factory.host),
    trustRoot=trustRoot,
    clientCertificate=client_cert)
    --- a/controls/OwnIdentityPanel.py Tue Mar 25 14:31:18 2025 +0100
    +++ b/controls/OwnIdentityPanel.py Tue Mar 25 14:32:37 2025 +0100
    @@ -15,7 +15,8 @@
    wx.Panel.__init__(self, parent, -1, size=(800, 600))
    main_sizer = wx.BoxSizer(wx.VERTICAL)
    - psk_part = wx.StaticBoxSizer(wx.VERTICAL, self, "PSK")
    + psk_staticbox = wx.StaticBox(self, label="PSK")
    + psk_part = wx.StaticBoxSizer(psk_staticbox, wx.VERTICAL)
    self.psk_text = wx.TextCtrl(self, style=wx.TE_READONLY | wx.TE_MULTILINE | wx.BORDER_NONE)
    @@ -40,7 +41,8 @@
    psk_part.Add(psk_btn_box, 0, border=5, flag=wx.GROW | wx.ALL)
    main_sizer.Add(psk_part, 1, border=5, flag=wx.GROW | wx.ALL)
    - cert_part = wx.StaticBoxSizer(wx.VERTICAL, self, "Client Certificate")
    + cert_staticbox = wx.StaticBox(self, label="Client Certificate")
    + cert_part = wx.StaticBoxSizer(cert_staticbox, wx.VERTICAL)
    self.cert_text = wx.TextCtrl(self, style=wx.TE_READONLY | wx.TE_MULTILINE | wx.BORDER_NONE)
    @@ -69,7 +71,7 @@
    def OnPSKExportButton(self, event):
    dialog = wx.FileDialog(self, _("Export IDE PSK"),
    wildcard=_("PLCOpen files (*.psk)|*.psk|All files|*.*"),
    - style=wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
    + style=wx.SAVE | wx.OVERWRITE_PROMPT)
    if dialog.ShowModal() == wx.ID_OK:
    filepath = dialog.GetPath()
    @@ -101,7 +103,7 @@
    def OnPSKImportButton(self, event):
    dialog = wx.FileDialog(self, _("Choose a file"),
    wildcard=_("PSK files (*.psk)|*.psk|All files|*.*"),
    - style=wx.FD_OPEN | wx.FD_FILE_MUST_EXIST)
    + style=wx.OPEN | wx.FILE_MUST_EXIST)
    if dialog.ShowModal() == wx.ID_OK:
    if self._confirm_overwrite_identity():
    PSK.ImportIDEIdentity(dialog.GetPath())
    @@ -125,8 +127,8 @@
    def OnImportClientCertButton(self, event):
    dialog = wx.FileDialog(self, _("Choose a file"),
    - style=wx.FD_OPEN | wx.FD_FILE_MUST_EXIST)
    wildcard=_("Certificate files (*.pem)|*.pem|All files|*.*"),
    + style=wx.OPEN | wx.FILE_MUST_EXIST)
    if dialog.ShowModal() == wx.ID_OK:
    if self._confirm_overwrite_identity():
    CertManagement.ImportClientCert(dialog.GetPath())