[Jython-checkins] SF.net SVN: jython:[6132] trunk/jython/Lib/socket.py

[<am...@us...>]

Revision: 6132
          http://jython.svn.sourceforge.net/jython/?rev=6132&view=rev
Author:   amak
Date:     2009-03-31 12:38:36 +0000 (Tue, 31 Mar 2009)

Log Message:
-----------
Undoing a change that got checked in here

http://fisheye3.atlassian.com/changelog/jython/?cs=4791

Which came originally from here

http://svn.python.org/view/python/trunk/Lib/socket.py?view=diff&r1=61007&r2=61008

But was wrong; changing min() to max() solves this problem.

The cpython change was ostensibly made to correct a memory allocation problem, but was wrong, and was undone here

http://svn.python.org/view?view=rev&revision=62627

We should probably review _fileobject implementation sometime, since the cpython one has now changed a fair amount.

Modified Paths:
--------------
    trunk/jython/Lib/socket.py

Modified: trunk/jython/Lib/socket.py
===================================================================
--- trunk/jython/Lib/socket.py	2009-03-31 03:35:14 UTC (rev 6131)
+++ trunk/jython/Lib/socket.py	2009-03-31 12:38:36 UTC (rev 6132)
@@ -1265,7 +1265,7 @@
             self._rbuf = ""
             while True:
                 left = size - buf_len
-                recv_size = min(self._rbufsize, left)
+                recv_size = max(self._rbufsize, left)
                 data = self._sock.recv(recv_size)
                 if not data:
                     break


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.