diff --git a/mopidy/frontends/mpd/__init__.py b/mopidy/frontends/mpd/__init__.py index 3d739c51..5d287d03 100644 --- a/mopidy/frontends/mpd/__init__.py +++ b/mopidy/frontends/mpd/__init__.py @@ -72,7 +72,7 @@ class MpdSession(network.LineProtocol): terminator = protocol.LINE_TERMINATOR encoding = protocol.ENCODING - delimeter = r'\r?\n' + delimiter = r'\r?\n' def __init__(self, connection): super(MpdSession, self).__init__(connection) diff --git a/mopidy/utils/network.py b/mopidy/utils/network.py index 7d97daf8..9cb8d74c 100644 --- a/mopidy/utils/network.py +++ b/mopidy/utils/network.py @@ -293,7 +293,7 @@ class LineProtocol(ThreadingActor): #: Regex to use for spliting lines, will be set compiled version of its #: own value, or to ``terminator``s value if it is not set itself. - delimeter = None + delimiter = None #: What encoding to expect incomming data to be in, can be :class:`None`. encoding = 'utf-8' @@ -304,10 +304,10 @@ class LineProtocol(ThreadingActor): self.prevent_timeout = False self.recv_buffer = '' - if self.delimeter: - self.delimeter = re.compile(self.delimeter) + if self.delimiter: + self.delimiter = re.compile(self.delimiter) else: - self.delimeter = re.compile(self.terminator) + self.delimiter = re.compile(self.terminator) @property def host(self): @@ -348,7 +348,7 @@ class LineProtocol(ThreadingActor): def parse_lines(self): """Consume new data and yield any lines found.""" while re.search(self.terminator, self.recv_buffer): - line, self.recv_buffer = self.delimeter.split( + line, self.recv_buffer = self.delimiter.split( self.recv_buffer, 1) yield line diff --git a/tests/utils/network/lineprotocol_test.py b/tests/utils/network/lineprotocol_test.py index b323de09..4ba62b8f 100644 --- a/tests/utils/network/lineprotocol_test.py +++ b/tests/utils/network/lineprotocol_test.py @@ -14,23 +14,23 @@ class LineProtocolTest(unittest.TestCase): self.mock.terminator = network.LineProtocol.terminator self.mock.encoding = network.LineProtocol.encoding - self.mock.delimeter = network.LineProtocol.delimeter + self.mock.delimiter = network.LineProtocol.delimiter self.mock.prevent_timeout = False def test_init_stores_values_in_attributes(self): - delimeter = re.compile(network.LineProtocol.terminator) + delimiter = re.compile(network.LineProtocol.terminator) network.LineProtocol.__init__(self.mock, sentinel.connection) self.assertEqual(sentinel.connection, self.mock.connection) self.assertEqual('', self.mock.recv_buffer) - self.assertEqual(delimeter, self.mock.delimeter) + self.assertEqual(delimiter, self.mock.delimiter) self.assertFalse(self.mock.prevent_timeout) - def test_init_compiles_delimeter(self): - self.mock.delimeter = '\r?\n' - delimeter = re.compile('\r?\n') + def test_init_compiles_delimiter(self): + self.mock.delimiter = '\r?\n' + delimiter = re.compile('\r?\n') network.LineProtocol.__init__(self.mock, sentinel.connection) - self.assertEqual(delimeter, self.mock.delimeter) + self.assertEqual(delimiter, self.mock.delimiter) def test_on_receive_no_new_lines_adds_to_recv_buffer(self): self.mock.connection = Mock(spec=network.Connection) @@ -108,21 +108,21 @@ class LineProtocolTest(unittest.TestCase): self.assertEqual(2, self.mock.on_line_received.call_count) def test_parse_lines_emtpy_buffer(self): - self.mock.delimeter = re.compile(r'\n') + self.mock.delimiter = re.compile(r'\n') self.mock.recv_buffer = '' lines = network.LineProtocol.parse_lines(self.mock) self.assertRaises(StopIteration, lines.next) def test_parse_lines_no_terminator(self): - self.mock.delimeter = re.compile(r'\n') + self.mock.delimiter = re.compile(r'\n') self.mock.recv_buffer = 'data' lines = network.LineProtocol.parse_lines(self.mock) self.assertRaises(StopIteration, lines.next) def test_parse_lines_termintor(self): - self.mock.delimeter = re.compile(r'\n') + self.mock.delimiter = re.compile(r'\n') self.mock.recv_buffer = 'data\n' lines = network.LineProtocol.parse_lines(self.mock) @@ -131,7 +131,7 @@ class LineProtocolTest(unittest.TestCase): self.assertEqual('', self.mock.recv_buffer) def test_parse_lines_termintor_with_carriage_return(self): - self.mock.delimeter = re.compile(r'\r?\n') + self.mock.delimiter = re.compile(r'\r?\n') self.mock.recv_buffer = 'data\r\n' lines = network.LineProtocol.parse_lines(self.mock) @@ -140,7 +140,7 @@ class LineProtocolTest(unittest.TestCase): self.assertEqual('', self.mock.recv_buffer) def test_parse_lines_no_data_before_terminator(self): - self.mock.delimeter = re.compile(r'\n') + self.mock.delimiter = re.compile(r'\n') self.mock.recv_buffer = '\n' lines = network.LineProtocol.parse_lines(self.mock) @@ -149,7 +149,7 @@ class LineProtocolTest(unittest.TestCase): self.assertEqual('', self.mock.recv_buffer) def test_parse_lines_extra_data_after_terminator(self): - self.mock.delimeter = re.compile(r'\n') + self.mock.delimiter = re.compile(r'\n') self.mock.recv_buffer = 'data1\ndata2' lines = network.LineProtocol.parse_lines(self.mock) @@ -158,7 +158,7 @@ class LineProtocolTest(unittest.TestCase): self.assertEqual('data2', self.mock.recv_buffer) def test_parse_lines_unicode(self): - self.mock.delimeter = re.compile(r'\n') + self.mock.delimiter = re.compile(r'\n') self.mock.recv_buffer = u'æøå\n'.encode('utf-8') lines = network.LineProtocol.parse_lines(self.mock) @@ -167,7 +167,7 @@ class LineProtocolTest(unittest.TestCase): self.assertEqual('', self.mock.recv_buffer) def test_parse_lines_multiple_lines(self): - self.mock.delimeter = re.compile(r'\n') + self.mock.delimiter = re.compile(r'\n') self.mock.recv_buffer = 'abc\ndef\nghi\njkl' lines = network.LineProtocol.parse_lines(self.mock) @@ -178,7 +178,7 @@ class LineProtocolTest(unittest.TestCase): self.assertEqual('jkl', self.mock.recv_buffer) def test_parse_lines_multiple_calls(self): - self.mock.delimeter = re.compile(r'\n') + self.mock.delimiter = re.compile(r'\n') self.mock.recv_buffer = 'data1' lines = network.LineProtocol.parse_lines(self.mock)