[95738] trunk/dports/python/py-spyder

[eborisch at macports.org]

Revision: 95738
          https://trac.macports.org/changeset/95738
Author:   eborisch at macports.org
Date:     2012-07-20 10:43:21 -0700 (Fri, 20 Jul 2012)
Log Message:
-----------
Improved bsdsocket patch.

Modified Paths:
--------------
    trunk/dports/python/py-spyder/Portfile
    trunk/dports/python/py-spyder/files/spyderlib_utils_bsdsocket.py.diff

Modified: trunk/dports/python/py-spyder/Portfile
===================================================================
--- trunk/dports/python/py-spyder/Portfile	2012-07-20 16:47:25 UTC (rev 95737)
+++ trunk/dports/python/py-spyder/Portfile	2012-07-20 17:43:21 UTC (rev 95738)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 name                py-spyder
 version             2.1.10
-revision            3
+revision            4
 epoch               20111202
 
 PortGroup           python 1.0

Modified: trunk/dports/python/py-spyder/files/spyderlib_utils_bsdsocket.py.diff
===================================================================
--- trunk/dports/python/py-spyder/files/spyderlib_utils_bsdsocket.py.diff	2012-07-20 16:47:25 UTC (rev 95737)
+++ trunk/dports/python/py-spyder/files/spyderlib_utils_bsdsocket.py.diff	2012-07-20 17:43:21 UTC (rev 95738)
@@ -1,12 +1,19 @@
---- spyderlib/utils/bsdsocket.py.orig	2012-06-18 09:50:37.000000000 -0500
-+++ spyderlib/utils/bsdsocket.py	2012-06-18 09:50:57.000000000 -0500
-@@ -33,6 +33,9 @@
+--- spyderlib/utils/bsdsocket.py.orig	2012-07-20 10:02:02.000000000 -0500
++++ spyderlib/utils/bsdsocket.py	2012-07-20 10:12:18.000000000 -0500
+@@ -32,11 +32,12 @@
+     sock.settimeout(timeout)
      dlen, data = None, None
      try:
-         datalen = sock.recv(SZ)
-+        if len(datalen) < SZ:  # Unable to read required size from socket
+-        datalen = sock.recv(SZ)
++        datalen = sock.recv(SZ, socket.MSG_WAITALL)
++        if len(datalen) < SZ:
 +          sock.settimeout(None)
 +          return
          dlen, = struct.unpack("l", datalen)
-         data = ''
-         while len(data) < dlen:
+-        data = ''
+-        while len(data) < dlen:
+-            data += sock.recv(dlen)
++        data = sock.recv(dlen, socket.MSG_WAITALL)
+     except socket.timeout:
+         raise
+     except socket.error:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120720/7e09d34d/attachment.html>