Commit 91a2a4b9 authored by Samuel Debionne's avatar Samuel Debionne

Merge branch '3-control-devices-creation-broken-in-python-3' into 'master'

Now can create control devices in python3, was due to the DevFailed bug in…

Closes #3

See merge request !22
parents 11d0ac2c 55853d0c
Pipeline #5386 passed with stages
in 26 seconds
......@@ -384,7 +384,7 @@ def to_tango_object(ct, name_id):
return setattr(self.__dict__["__ct"], name, value)
def __dir__(self):
return dir(self.__dict__["__ct"]) + keys
return dir(self.__dict__["__ct"]) + list(keys)
def __reduce__(self):
import PyTango.client
......
......@@ -2654,7 +2654,6 @@ def main() :
except: pass
pytango_ver = PyTango.__version_info__[:3]
py_ver_3 = sys.version_info[0] == 3
try:
py = PyTango.Util(sys.argv)
......@@ -2670,7 +2669,7 @@ def main() :
# create ct control
control = _get_control()
if not py_ver_3 and pytango_ver >= (8,1,7) and control is not None:
if pytango_ver >= (8,1,7) and control is not None:
master_dev_name = get_lima_device_name()
beamline_name, _, camera_name = master_dev_name.split('/')
name_template = "{0}/{{type}}/{1}".format(beamline_name, camera_name)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment