[Pkg-mpd-commits] [python-mpd] 29/262: mpd.py: use a separate file object for reading and writing sockets
Simon McVittie
smcv at debian.org
Sun May 22 18:16:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch upstream
in repository python-mpd.
commit cde055b004d6e9f8a8d3c9548d4f4778c6897472
Author: J. Alexander Treuman <jat at spatialrift.net>
Date: Sun Mar 23 15:57:37 2008 -0400
mpd.py: use a separate file object for reading and writing sockets
This is to make it easier to read command output from a file instead of a
socket. Useful for testing and benchmarking.
---
mpd.py | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/mpd.py b/mpd.py
index 02d2788..33449ca 100644
--- a/mpd.py
+++ b/mpd.py
@@ -141,8 +141,8 @@ class MPDClient(object):
self._commandlist.append(retval)
def _writeline(self, line):
- self._sockfile.write("%s\n" % line)
- self._sockfile.flush()
+ self._wfile.write("%s\n" % line)
+ self._wfile.flush()
def _writecommand(self, command, args=[]):
parts = [command]
@@ -151,7 +151,7 @@ class MPDClient(object):
self._writeline(" ".join(parts))
def _readline(self):
- line = self._sockfile.readline()
+ line = self._rfile.readline()
if not line.endswith("\n"):
raise ConnectionError, "Connection lost while reading line"
line = line.rstrip("\n")
@@ -272,7 +272,7 @@ class MPDClient(object):
return self._wrapiterator(self._readcommandlist())
def _hello(self):
- line = self._sockfile.readline()
+ line = self._rfile.readline()
if not line.endswith("\n"):
raise ConnectionError, "Connection lost while reading MPD hello"
if not line.startswith(HELLO_PREFIX):
@@ -283,18 +283,21 @@ class MPDClient(object):
self.mpd_version = None
self._commandlist = None
self._sock = None
- self._sockfile = _NotConnected()
+ self._rfile = _NotConnected()
+ self._wfile = _NotConnected()
def connect(self, host, port):
if self._sock:
self.disconnect()
self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self._sock.connect((host, port))
- self._sockfile = self._sock.makefile("rb+")
+ self._rfile = self._sock.makefile("rb")
+ self._wfile = self._sock.makefile("wb")
self._hello()
def disconnect(self):
- self._sockfile.close()
+ self._rfile.close()
+ self._wfile.close()
self._sock.close()
self._reset()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/python-mpd.git
More information about the Pkg-mpd-commits
mailing list