diff -r 29b02164e65d -r 4ba27ed51e48 connectors/__init__.py --- a/connectors/__init__.py Tue Mar 24 14:06:28 2015 +0100 +++ b/connectors/__init__.py Fri Apr 03 17:08:13 2015 +0200 @@ -1,23 +1,23 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD +# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD # -#See COPYING file for copyrights details. +# See COPYING file for copyrights details. # -#This library is free software; you can redistribute it and/or -#modify it under the terms of the GNU General Public -#License as published by the Free Software Foundation; either -#version 2.1 of the License, or (at your option) any later version. +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. # -#This library is distributed in the hope that it will be useful, -#but WITHOUT ANY WARRANTY; without even the implied warranty of -#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -#General Public License for more details. +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # -#You should have received a copy of the GNU General Public -#License along with this library; if not, write to the Free Software -#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Package initialisation @@ -28,13 +28,14 @@ def _GetLocalConnectorClassFactory(name): - return lambda:getattr(__import__(name,globals(),locals()), name + "_connector_factory") + return lambda: getattr(__import__(name, globals(), locals()), name + "_connector_factory") connectors = {name:_GetLocalConnectorClassFactory(name) for name in listdir(_base_path) if path.isdir(path.join(_base_path, name)) and not name.startswith("__")} + def ConnectorFactory(uri, confnodesroot): """ Return a connector corresponding to the URI @@ -48,15 +49,14 @@ servicetype = "PYRO" runtime_port = confnodesroot.AppFrame.StartLocalRuntime( taskbaricon=True) - uri="PYRO://127.0.0.1:"+str(runtime_port) + uri = "PYROLOC://127.0.0.1:" + str(runtime_port) elif servicetype in connectors: pass - elif servicetype[-1]=='S' and servicetype[:-1] in connectors: + elif servicetype[-1] == 'S' and servicetype[:-1] in connectors: servicetype = servicetype[:-1] - else : + else: return None # import module according to uri type connectorclass = connectors[servicetype]() return connectorclass(uri, confnodesroot) -