From 2449308758b27dda3b83adf11151553dc54c83e6 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Thu, 7 Jul 2011 23:47:28 +0200 Subject: [PATCH] Use re for finding terminator and splitting as it does not assume unicode --- mopidy/utils/network.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mopidy/utils/network.py b/mopidy/utils/network.py index 76bebc1d..a9cde77d 100644 --- a/mopidy/utils/network.py +++ b/mopidy/utils/network.py @@ -120,6 +120,7 @@ class LineProtocol(ThreadingActor): self.send_lock = threading.Lock() self.recv_buffer = '' self.send_buffer = '' + self.terminator_re = re.compile(self.terminator) def on_line_received(self, line): """ @@ -152,8 +153,9 @@ class LineProtocol(ThreadingActor): """Consume new data and yield any lines found.""" if new_data: self.recv_buffer += new_data - while self.terminator in self.recv_buffer: - line, self.recv_buffer = self.recv_buffer.split(self.terminator, 1) + while self.terminator_re.search(self.recv_buffer): + line, self.recv_buffer = self.terminator_re.split( + self.recv_buffer, 1) yield line def log_raw_data(self, data):