Author: Armin Rigo <[email protected]>
Branch:
Changeset: r65969:c30185912227
Date: 2013-08-06 14:14 +0200
http://bitbucket.org/pypy/pypy/changeset/c30185912227/
Log: Fix for tests: add _reuse and _drop methods in mock low-level socket
objects
diff --git a/lib-python/2.7/test/test_socket.py
b/lib-python/2.7/test/test_socket.py
--- a/lib-python/2.7/test/test_socket.py
+++ b/lib-python/2.7/test/test_socket.py
@@ -1066,6 +1066,9 @@
def recv(self, size):
return self._recv_step.next()()
+ def _reuse(self): pass
+ def _drop(self): pass
+
@staticmethod
def _raise_eintr():
raise socket.error(errno.EINTR)
@@ -1321,7 +1324,8 @@
closed = False
def flush(self): pass
def close(self): self.closed = True
- def _decref_socketios(self): pass
+ def _reuse(self): pass
+ def _drop(self): pass
# must not close unless we request it: the original use of _fileobject
# by module socket requires that the underlying socket not be closed
until
diff --git a/lib-python/2.7/test/test_urllib2.py
b/lib-python/2.7/test/test_urllib2.py
--- a/lib-python/2.7/test/test_urllib2.py
+++ b/lib-python/2.7/test/test_urllib2.py
@@ -270,6 +270,8 @@
self.reason = reason
def read(self):
return ''
+ def _reuse(self): pass
+ def _drop(self): pass
class MockHTTPClass:
def __init__(self):
diff --git a/lib-python/2.7/urllib2.py b/lib-python/2.7/urllib2.py
--- a/lib-python/2.7/urllib2.py
+++ b/lib-python/2.7/urllib2.py
@@ -1193,6 +1193,8 @@
# out of socket._fileobject() and into a base class.
r.recv = r.read
+ r._reuse = lambda: None
+ r._drop = lambda: None
fp = socket._fileobject(r, close=True)
resp = addinfourl(fp, r.msg, req.get_full_url())
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
