From df25de89f732c2a6b4369f6495de3ed8c4f2613b Mon Sep 17 00:00:00 2001 From: Matteo Mecucci Date: Sun, 3 Jun 2012 11:29:35 +0200 Subject: [PATCH 1/2] Fixed an issue with a readline from socket in bpd --- beetsplug/bpd/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/beetsplug/bpd/__init__.py b/beetsplug/bpd/__init__.py index 681331a85..e909bdc2f 100644 --- a/beetsplug/bpd/__init__.py +++ b/beetsplug/bpd/__init__.py @@ -583,9 +583,10 @@ class Connection(object): clist = None # Initially, no command list is being constructed. while True: - line = (yield self.sock.readline()).strip() + line = yield self.sock.readline() if not line: break + line = line.strip() log.debug(line) if clist is not None: From 469fb95e3e57923a590d341175f3119726b69ef9 Mon Sep 17 00:00:00 2001 From: Matteo Mecucci Date: Sun, 3 Jun 2012 22:06:46 +0200 Subject: [PATCH 2/2] Added a second check for empty line in bpd after my latest change --- beetsplug/bpd/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/beetsplug/bpd/__init__.py b/beetsplug/bpd/__init__.py index e909bdc2f..61cabad59 100644 --- a/beetsplug/bpd/__init__.py +++ b/beetsplug/bpd/__init__.py @@ -587,6 +587,8 @@ class Connection(object): if not line: break line = line.strip() + if not line: + break log.debug(line) if clist is not None: