Commit 084b75b5 authored by Philip ABBET's avatar Philip ABBET

Ensure that input and output names are strings (zmq doesn't like unicode strings)

parent 3bc41677
...@@ -79,7 +79,7 @@ class Input: ...@@ -79,7 +79,7 @@ class Input:
def __init__(self, name, data_format, data_source): def __init__(self, name, data_format, data_source):
self.group = None self.group = None
self.name = name self.name = str(name)
self.data = None self.data = None
self.data_index = -1 self.data_index = -1
self.data_index_end = -1 self.data_index_end = -1
...@@ -170,7 +170,7 @@ class InputGroup: ...@@ -170,7 +170,7 @@ class InputGroup:
self._inputs = [] self._inputs = []
self.data_index = -1 self.data_index = -1
self.data_index_end = -1 self.data_index_end = -1
self.channel = channel self.channel = str(channel)
self.synchronization_listener = synchronization_listener self.synchronization_listener = synchronization_listener
self.restricted_access = restricted_access self.restricted_access = restricted_access
...@@ -282,7 +282,7 @@ class RemoteInput: ...@@ -282,7 +282,7 @@ class RemoteInput:
def __init__(self, name, data_format, socket): def __init__(self, name, data_format, socket):
self.name = name self.name = str(name)
self.data_format = data_format self.data_format = data_format
self.socket = socket self.socket = socket
self.data = None self.data = None
...@@ -391,7 +391,7 @@ class RemoteInputGroup: ...@@ -391,7 +391,7 @@ class RemoteInputGroup:
def __init__(self, channel, restricted_access, socket): def __init__(self, channel, restricted_access, socket):
self._inputs = [] self._inputs = []
self.channel = channel self.channel = str(channel)
self.restricted_access = restricted_access self.restricted_access = restricted_access
self.socket = socket self.socket = socket
self.comm_time = 0. self.comm_time = 0.
......
...@@ -84,7 +84,7 @@ class Output: ...@@ -84,7 +84,7 @@ class Output:
def __init__(self, name, data_sink, synchronization_listener=None, def __init__(self, name, data_sink, synchronization_listener=None,
dataset_output=False, force_start_index=0): dataset_output=False, force_start_index=0):
self.name = name self.name = str(name)
self.data_sink = data_sink self.data_sink = data_sink
self._synchronization_listener = synchronization_listener self._synchronization_listener = synchronization_listener
self._dataset_output = dataset_output self._dataset_output = dataset_output
...@@ -188,7 +188,7 @@ class RemoteOutput: ...@@ -188,7 +188,7 @@ class RemoteOutput:
def __init__(self, name, data_format, socket): def __init__(self, name, data_format, socket):
self.name = name self.name = str(name)
self.data_format = data_format self.data_format = data_format
self.socket = socket self.socket = socket
self.comm_time = 0. #total time spent on communication self.comm_time = 0. #total time spent on communication
......
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