--- a/connectors/PYRO/__init__.py Fri Apr 20 11:21:20 2018 +0200
+++ b/connectors/PYRO/__init__.py Wed May 09 11:16:27 2018 +0200
@@ -36,9 +36,14 @@
import Pyro.util
from Pyro.errors import PyroError
-import wx
-from controls.UriLocationEditor import IConnectorPanel
-from zope.interface import implementer
+try:
+ import wx
+ isWx = True
+except ImportError:
+ isWx = False
+else:
+ from controls.UriLocationEditor import IConnectorPanel
+ from zope.interface import implementer
service_type = '_PYRO._tcp.local.'
# this module attribute contains a list of DNS-SD (Zeroconf) service types
@@ -210,55 +215,55 @@
return PyroProxyProxy()
-
-def PYRO_connector_dialog(confnodesroot):
- [ID_IPTEXT, ID_PORTTEXT] = [wx.NewId() for _init_ctrls in range(2)]
-
-
- @implementer(IConnectorPanel)
- class PYROConnectorPanel(wx.Panel):
- def __init__(self, typeConnector, parrent, *args, **kwargs):
- self.type = typeConnector
- self.parrent = parrent
- wx.Panel.__init__(self, parrent, *args, **kwargs)
- self._init_ctrls()
- self._init_sizers()
- self.uri = None
-
- def _init_ctrls(self):
- self.IpText = wx.TextCtrl(parent=self, id=ID_IPTEXT, size = wx.Size(200, -1))
- self.PortText = wx.TextCtrl(parent=self, id=ID_PORTTEXT, size = wx.Size(200, -1))
-
- def _init_sizers(self):
- self.mainSizer = wx.BoxSizer(wx.VERTICAL)
- self.uriSizer = wx.BoxSizer(wx.HORIZONTAL)
- self.portSizer = wx.BoxSizer(wx.HORIZONTAL)
-
- self.uriSizer.Add(wx.StaticText(self, wx.ID_ANY, "URI host:", size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL)
- self.uriSizer.AddSpacer((0,0))
- self.uriSizer.Add(self.IpText, proportion=1, flag=wx.ALIGN_RIGHT)
- self.mainSizer.Add(self.uriSizer, border=2, flag=wx.ALL)
-
- self.portSizer.Add(wx.StaticText(self, wx.ID_ANY, "URI port:", size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL)
- self.portSizer.AddSpacer((0,0))
- self.portSizer.Add(self.PortText, proportion=1, flag=wx.ALIGN_RIGHT)
- self.mainSizer.Add(self.portSizer, border=2, flag=wx.ALL)
-
- self.SetSizer(self.mainSizer)
-
- def SetURI(self, uri):
- self.uri = uri
- uri_list = uri.strip().split(":")
- length = len(uri_list)
- if length == 3:
- self.IpText.SetValue(uri_list[1].strip("/"))
- self.PortText.SetValue(uri_list[2])
- elif length == 2:
- self.IpText.SetValue(uri_list[1].strip("/"))
-
-
- def GetURI(self):
- self.uri = self.type+"://"+self.IpText.GetValue()+":"+self.PortText.GetValue()
- return self.uri
-
- return PYROConnectorPanel("PYRO", confnodesroot)
+if isWx:
+ def PYRO_connector_dialog(confnodesroot):
+ [ID_IPTEXT, ID_PORTTEXT] = [wx.NewId() for _init_ctrls in range(2)]
+
+
+ @implementer(IConnectorPanel)
+ class PYROConnectorPanel(wx.Panel):
+ def __init__(self, typeConnector, parrent, *args, **kwargs):
+ self.type = typeConnector
+ self.parrent = parrent
+ wx.Panel.__init__(self, parrent, *args, **kwargs)
+ self._init_ctrls()
+ self._init_sizers()
+ self.uri = None
+
+ def _init_ctrls(self):
+ self.IpText = wx.TextCtrl(parent=self, id=ID_IPTEXT, size = wx.Size(200, -1))
+ self.PortText = wx.TextCtrl(parent=self, id=ID_PORTTEXT, size = wx.Size(200, -1))
+
+ def _init_sizers(self):
+ self.mainSizer = wx.BoxSizer(wx.VERTICAL)
+ self.uriSizer = wx.BoxSizer(wx.HORIZONTAL)
+ self.portSizer = wx.BoxSizer(wx.HORIZONTAL)
+
+ self.uriSizer.Add(wx.StaticText(self, wx.ID_ANY, "URI host:", size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL)
+ self.uriSizer.AddSpacer((0,0))
+ self.uriSizer.Add(self.IpText, proportion=1, flag=wx.ALIGN_RIGHT)
+ self.mainSizer.Add(self.uriSizer, border=2, flag=wx.ALL)
+
+ self.portSizer.Add(wx.StaticText(self, wx.ID_ANY, "URI port:", size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL)
+ self.portSizer.AddSpacer((0,0))
+ self.portSizer.Add(self.PortText, proportion=1, flag=wx.ALIGN_RIGHT)
+ self.mainSizer.Add(self.portSizer, border=2, flag=wx.ALL)
+
+ self.SetSizer(self.mainSizer)
+
+ def SetURI(self, uri):
+ self.uri = uri
+ uri_list = uri.strip().split(":")
+ length = len(uri_list)
+ if length == 3:
+ self.IpText.SetValue(uri_list[1].strip("/"))
+ self.PortText.SetValue(uri_list[2])
+ elif length == 2:
+ self.IpText.SetValue(uri_list[1].strip("/"))
+
+
+ def GetURI(self):
+ self.uri = self.type+"://"+self.IpText.GetValue()+":"+self.PortText.GetValue()
+ return self.uri
+
+ return PYROConnectorPanel("PYRO", confnodesroot)
--- a/connectors/WAMP/__init__.py Fri Apr 20 11:21:20 2018 +0200
+++ b/connectors/WAMP/__init__.py Wed May 09 11:16:27 2018 +0200
@@ -25,9 +25,14 @@
from __future__ import absolute_import
from __future__ import print_function
-import wx
-from controls.UriLocationEditor import IConnectorPanel
-from zope.interface import implementer
+try:
+ import wx
+ isWx = True
+except ImportError:
+ isWx = False
+else:
+ from controls.UriLocationEditor import IConnectorPanel
+ from zope.interface import implementer
import traceback
from threading import Thread, Event
@@ -163,85 +168,85 @@
confnodesroot.logger.write_error(traceback.format_exc())
return None
-
-def WAMP_connector_dialog(confnodesroot):
- [ID_IPTEXT, ID_PORTTEXT, ID_REALMTEXT, ID_WAMPIDTEXT, ID_SECURECHECKBOX] = [wx.NewId() for _init_ctrls in range(5)]
-
-
- @implementer(IConnectorPanel)
- class WAMPConnectorPanel(wx.Panel):
- def __init__(self, typeConnector, parrent, *args, **kwargs):
- self.type = typeConnector
- self.parrent = parrent
- wx.Panel.__init__(self, parrent, *args, **kwargs)
- self._init_ctrls()
- self._init_sizers()
- self.uri = None
-
- def _init_ctrls(self):
- self.IpText = wx.TextCtrl(parent=self, id=ID_IPTEXT, size = wx.Size(200, -1))
- self.PortText = wx.TextCtrl(parent=self, id=ID_PORTTEXT, size = wx.Size(200, -1))
- self.RealmText = wx.TextCtrl(parent=self, id=ID_REALMTEXT, size = wx.Size(200, -1))
- self.WAMPIDText = wx.TextCtrl(parent=self, id=ID_WAMPIDTEXT, size = wx.Size(200, -1))
- self.SecureCheckbox = wx.CheckBox(self, ID_SECURECHECKBOX, _("Is connection secure?"))
-
- def _init_sizers(self):
- self.mainSizer = wx.BoxSizer(wx.VERTICAL)
- self.uriSizer = wx.BoxSizer(wx.HORIZONTAL)
- self.portSizer = wx.BoxSizer(wx.HORIZONTAL)
- self.realmSizer = wx.BoxSizer(wx.HORIZONTAL)
- self.wampIDSizer = wx.BoxSizer(wx.HORIZONTAL)
-
- self.uriSizer.Add(wx.StaticText(self, wx.ID_ANY, _("URI host:"), size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL)
- self.uriSizer.AddSpacer((0,0))
- self.uriSizer.Add(self.IpText, proportion=1, flag=wx.ALIGN_RIGHT)
- self.mainSizer.Add(self.uriSizer, border=2, flag=wx.ALL)
-
- self.portSizer.Add(wx.StaticText(self, wx.ID_ANY, _("URI port:"), size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL)
- self.portSizer.AddSpacer((0,0))
- self.portSizer.Add(self.PortText, proportion=1, flag=wx.ALIGN_RIGHT)
- self.mainSizer.Add(self.portSizer, border=2, flag=wx.ALL)
-
- self.realmSizer.Add(wx.StaticText(self, wx.ID_ANY, _("Realm:"), size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL)
- self.realmSizer.AddSpacer((0, 0))
- self.realmSizer.Add(self.RealmText, proportion=1, flag=wx.ALIGN_RIGHT)
- self.mainSizer.Add(self.realmSizer, border=2, flag=wx.ALL)
-
- self.wampIDSizer.Add(wx.StaticText(self, wx.ID_ANY, _("WAMP ID:"), size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL)
- self.wampIDSizer.AddSpacer((0, 0))
- self.wampIDSizer.Add(self.WAMPIDText, proportion=1, flag=wx.ALIGN_RIGHT)
- self.mainSizer.Add(self.wampIDSizer, border=2, flag=wx.ALL)
-
- self.mainSizer.Add(self.SecureCheckbox, proportion=1, flag=wx.ALIGN_LEFT)
-
- self.SetSizer(self.mainSizer)
-
- def SetURI(self, uri):
- self.uri = uri
- uri_list = uri.strip().split(":")
- length = len(uri_list)
-
- if length > 0:
- if uri_list[0] == URITypes[1]:
- self.SecureCheckbox.SetValue(True)
-
- if length > 2:
- self.IpText.SetValue(uri_list[1].strip("/"))
- wampSett = uri_list[2].split("#")
- length2 = len(wampSett)
- if length2 > 0:
- self.PortText.SetValue(wampSett[0])
- if length2 > 1:
- self.RealmText.SetValue(wampSett[1])
- if length2 > 2:
- self.WAMPIDText.SetValue(wampSett[2])
-
- def GetURI(self):
- if self.IpText.Validate():
- typeForURI = self.type + "S" if self.SecureCheckbox.GetValue() else self.type
- self.uri = typeForURI + "://" + self.IpText.GetValue() + ":" + self.PortText.GetValue() + "#" + self.RealmText.GetValue() + "#" + self.WAMPIDText.GetValue()
- return self.uri
- else:
- return ""
-
- return WAMPConnectorPanel("WAMP", confnodesroot)
+if isWx:
+ def WAMP_connector_dialog(confnodesroot):
+ [ID_IPTEXT, ID_PORTTEXT, ID_REALMTEXT, ID_WAMPIDTEXT, ID_SECURECHECKBOX] = [wx.NewId() for _init_ctrls in range(5)]
+
+
+ @implementer(IConnectorPanel)
+ class WAMPConnectorPanel(wx.Panel):
+ def __init__(self, typeConnector, parrent, *args, **kwargs):
+ self.type = typeConnector
+ self.parrent = parrent
+ wx.Panel.__init__(self, parrent, *args, **kwargs)
+ self._init_ctrls()
+ self._init_sizers()
+ self.uri = None
+
+ def _init_ctrls(self):
+ self.IpText = wx.TextCtrl(parent=self, id=ID_IPTEXT, size = wx.Size(200, -1))
+ self.PortText = wx.TextCtrl(parent=self, id=ID_PORTTEXT, size = wx.Size(200, -1))
+ self.RealmText = wx.TextCtrl(parent=self, id=ID_REALMTEXT, size = wx.Size(200, -1))
+ self.WAMPIDText = wx.TextCtrl(parent=self, id=ID_WAMPIDTEXT, size = wx.Size(200, -1))
+ self.SecureCheckbox = wx.CheckBox(self, ID_SECURECHECKBOX, _("Is connection secure?"))
+
+ def _init_sizers(self):
+ self.mainSizer = wx.BoxSizer(wx.VERTICAL)
+ self.uriSizer = wx.BoxSizer(wx.HORIZONTAL)
+ self.portSizer = wx.BoxSizer(wx.HORIZONTAL)
+ self.realmSizer = wx.BoxSizer(wx.HORIZONTAL)
+ self.wampIDSizer = wx.BoxSizer(wx.HORIZONTAL)
+
+ self.uriSizer.Add(wx.StaticText(self, wx.ID_ANY, _("URI host:"), size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL)
+ self.uriSizer.AddSpacer((0,0))
+ self.uriSizer.Add(self.IpText, proportion=1, flag=wx.ALIGN_RIGHT)
+ self.mainSizer.Add(self.uriSizer, border=2, flag=wx.ALL)
+
+ self.portSizer.Add(wx.StaticText(self, wx.ID_ANY, _("URI port:"), size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL)
+ self.portSizer.AddSpacer((0,0))
+ self.portSizer.Add(self.PortText, proportion=1, flag=wx.ALIGN_RIGHT)
+ self.mainSizer.Add(self.portSizer, border=2, flag=wx.ALL)
+
+ self.realmSizer.Add(wx.StaticText(self, wx.ID_ANY, _("Realm:"), size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL)
+ self.realmSizer.AddSpacer((0, 0))
+ self.realmSizer.Add(self.RealmText, proportion=1, flag=wx.ALIGN_RIGHT)
+ self.mainSizer.Add(self.realmSizer, border=2, flag=wx.ALL)
+
+ self.wampIDSizer.Add(wx.StaticText(self, wx.ID_ANY, _("WAMP ID:"), size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL)
+ self.wampIDSizer.AddSpacer((0, 0))
+ self.wampIDSizer.Add(self.WAMPIDText, proportion=1, flag=wx.ALIGN_RIGHT)
+ self.mainSizer.Add(self.wampIDSizer, border=2, flag=wx.ALL)
+
+ self.mainSizer.Add(self.SecureCheckbox, proportion=1, flag=wx.ALIGN_LEFT)
+
+ self.SetSizer(self.mainSizer)
+
+ def SetURI(self, uri):
+ self.uri = uri
+ uri_list = uri.strip().split(":")
+ length = len(uri_list)
+
+ if length > 0:
+ if uri_list[0] == URITypes[1]:
+ self.SecureCheckbox.SetValue(True)
+
+ if length > 2:
+ self.IpText.SetValue(uri_list[1].strip("/"))
+ wampSett = uri_list[2].split("#")
+ length2 = len(wampSett)
+ if length2 > 0:
+ self.PortText.SetValue(wampSett[0])
+ if length2 > 1:
+ self.RealmText.SetValue(wampSett[1])
+ if length2 > 2:
+ self.WAMPIDText.SetValue(wampSett[2])
+
+ def GetURI(self):
+ if self.IpText.Validate():
+ typeForURI = self.type + "S" if self.SecureCheckbox.GetValue() else self.type
+ self.uri = typeForURI + "://" + self.IpText.GetValue() + ":" + self.PortText.GetValue() + "#" + self.RealmText.GetValue() + "#" + self.WAMPIDText.GetValue()
+ return self.uri
+ else:
+ return ""
+
+ return WAMPConnectorPanel("WAMP", confnodesroot)
--- a/controls/UriLocationEditor.py Fri Apr 20 11:21:20 2018 +0200
+++ b/controls/UriLocationEditor.py Wed May 09 11:16:27 2018 +0200
@@ -5,9 +5,6 @@
[ID_URIWIZARDDIALOG,ID_URITYPECHOICE] = [wx.NewId() for _init_ctrls in range(2)]
-URITYPES = ["- Select URI type -"]
-URITYPES.extend([key for key, value in connectors_dialog.iteritems()])
-
class IConnectorPanel(Interface):
"""This is interface for panel of seperate connector type"""
@@ -26,8 +23,7 @@
wx.Dialog.__init__(self, id=ID_URIWIZARDDIALOG,
name='UriLocationEditor', parent=parent,
title='Uri location')
- self.UriTypeChoice = wx.Choice(parent=self, id=ID_URIWIZARDDIALOG,
- choices = URITYPES)
+ self.UriTypeChoice = wx.Choice(parent=self, id=ID_URIWIZARDDIALOG, choices = self.URITYPES)
self.UriTypeChoice.SetSelection(0)
self.Bind(wx.EVT_CHOICE, self.OnTypeChoice, self.UriTypeChoice)
self.PanelSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -35,10 +31,6 @@
def _init_sizers(self):
self.mainSizer = wx.BoxSizer(wx.VERTICAL)
- # self.mainSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=3, vgap=0)
- # self.mainSizer.AddGrowableCol(0)
- # self.mainSizer.AddGrowableRow(0)
-
typeSizer = wx.BoxSizer(wx.HORIZONTAL)
typeSizer.Add(wx.StaticText(self,wx.ID_ANY,"URI type:"), border=5, flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
typeSizer.Add(self.UriTypeChoice, border=5, flag=wx.ALL)
@@ -49,6 +41,14 @@
self.SetSizer(self.mainSizer)
def __init__(self, parent, uri):
+ self.URITYPES = ["- Select URI type -"]
+ for connector_type, connector_function in connectors_dialog.iteritems():
+ try:
+ connector_function['function']()
+ self.URITYPES.append(connector_type)
+ except Exception as e:
+ pass
+
self.selected = None
self.parrent = parent
self.logger = self.parrent.CTR.logger