diff -r 52630996e51b -r eeca1aff0691 connectors/__init__.py --- a/connectors/__init__.py Sat Jun 09 17:13:16 2018 +0300 +++ b/connectors/__init__.py Sat Jun 09 17:14:56 2018 +0300 @@ -36,9 +36,11 @@ def _GetLocalConnectorClassFactory(name): return lambda: getattr(__import__(name, globals(), locals()), name + "_connector_factory") + def _GetLocalConnectorClassDialog(name): return lambda: getattr(__import__(name + '.dialog', globals(), locals(), fromlist=['dialog']), name + "_connector_dialog") + def _GetLocalConnectorURITypes(name): return lambda: getattr(__import__(name + '.dialog', globals(), locals(), fromlist=['dialog']), "URITypes", None) @@ -50,7 +52,7 @@ not name.startswith("__"))} connectors_dialog = {name: - {"function":_GetLocalConnectorClassDialog(name), "URITypes": _GetLocalConnectorURITypes(name)} + {"function": _GetLocalConnectorClassDialog(name), "URITypes": _GetLocalConnectorURITypes(name)} for name in listdir(_base_path) if (path.isdir(path.join(_base_path, name)) and not name.startswith("__"))} @@ -81,6 +83,7 @@ connectorclass = connectors[servicetype]() return connectorclass(uri, confnodesroot) + def ConnectorDialog(conn_type, confnodesroot): if conn_type not in connectors_dialog: return None @@ -88,6 +91,7 @@ connectorclass = connectors_dialog[conn_type]["function"]() return connectorclass(confnodesroot) + def GetConnectorFromURI(uri): typeOfConnector = None for conn_type in connectors_dialog: