Skip to content
Snippets Groups Projects
Commit 4c98918e authored by Alexandre MALFREYT's avatar Alexandre MALFREYT Committed by Florent LANGLOIS
Browse files

Revert "Remove 'six' for string handling in socket commands (unused)"

This reverts commit a70f15d4.
parent 051e5d13
No related branches found
1 merge request!2Python 3 + améliorations
...@@ -50,6 +50,7 @@ import sys ...@@ -50,6 +50,7 @@ import sys
import os import os
from GEpressCtrlPACE5000Channel import GEpressCtrlPACE5000Channel, GEpressCtrlPACE5000ChannelClass from GEpressCtrlPACE5000Channel import GEpressCtrlPACE5000Channel, GEpressCtrlPACE5000ChannelClass
import socket import socket
import six
#----- PROTECTED REGION END -----# // GEpressCtrlPACE5000.additionnal_import #----- PROTECTED REGION END -----# // GEpressCtrlPACE5000.additionnal_import
...@@ -295,7 +296,7 @@ class GEpressCtrlPACE5000 (PyTango.LatestDeviceImpl): ...@@ -295,7 +296,7 @@ class GEpressCtrlPACE5000 (PyTango.LatestDeviceImpl):
""" """
self.debug_stream("In WriteSocket()") self.debug_stream("In WriteSocket()")
#----- PROTECTED REGION ID(GEpressCtrlPACE5000.WriteSocket) ENABLED START -----# #----- PROTECTED REGION ID(GEpressCtrlPACE5000.WriteSocket) ENABLED START -----#
cmd = argin + '\n' cmd = six.b(argin + '\n')
self.socket.send(cmd) self.socket.send(cmd)
self.debug_stream("Sent command: " + argin) self.debug_stream("Sent command: " + argin)
...@@ -320,7 +321,7 @@ class GEpressCtrlPACE5000 (PyTango.LatestDeviceImpl): ...@@ -320,7 +321,7 @@ class GEpressCtrlPACE5000 (PyTango.LatestDeviceImpl):
argout = "" argout = ""
#----- PROTECTED REGION ID(GEpressCtrlPACE5000.WriteReadSocket) ENABLED START -----# #----- PROTECTED REGION ID(GEpressCtrlPACE5000.WriteReadSocket) ENABLED START -----#
cmd = argin + '\n' cmd = six.b(argin + '\n')
self.socket.send(cmd) self.socket.send(cmd)
self.debug_stream("Sent command: " + argin) self.debug_stream("Sent command: " + argin)
argout = self.socket.recv(100) argout = self.socket.recv(100)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment