Commit d8e0ce42 authored by Matias Guijarro's avatar Matias Guijarro

Merge branch 'prologix_remaining_ord' into 'master'

remove remaining ord() in Prologix for python3

See merge request !1168
parents fc00cb7d 470353d8
Pipeline #9214 passed with stages
in 21 minutes and 13 seconds
......@@ -28,6 +28,7 @@ from .libnienet import EnetSocket
from ..tcp import Socket
from ..exceptions import CommunicationError, CommunicationTimeout
from ...common.greenlet_utils import KillMask, protect_from_kill
from bliss.comm.util import HexMsg
from bliss.common.tango import DeviceProxy
......@@ -153,7 +154,7 @@ class Prologix:
self._eos = self._gpib_kwargs["eos"]
if self._eos == "\r\n":
"Prologix::init() eos set to 0 (%s)" % [ord(c) for c in self._eos]
"Prologix::init() eos set to 0 (%s)" % str(HexMsg(self._eos))
self._sock.write(b"++eos 0\n")
elif self._eos == "\r":
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