summaryrefslogtreecommitdiff
path: root/Lib/shutil.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-03-22 15:09:31 +0000
committerAntoine Pitrou <solipsis@pitrou.net>2010-03-22 15:09:31 +0000
commita06bfd87da41d0a8810b3fd911d7b93ebdaa8ded (patch)
treef6206b79540f9fb28efd8eb7aa4ce2c4645153ea /Lib/shutil.py
parentabdb21a3a89e0fed89e361d86990c90a998ac9ec (diff)
downloadcpython-git-a06bfd87da41d0a8810b3fd911d7b93ebdaa8ded.tar.gz
Merged revisions 79287,79289 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r79287 | antoine.pitrou | 2010-03-22 15:49:10 +0100 (lun., 22 mars 2010) | 13 lines Merged revisions 79226,79286 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79226 | antoine.pitrou | 2010-03-21 20:33:38 +0100 (dim., 21 mars 2010) | 4 lines Issue #3890: Fix recv() and recv_into() on non-blocking SSL sockets. ........ r79286 | antoine.pitrou | 2010-03-22 15:41:48 +0100 (lun., 22 mars 2010) | 3 lines Fix an occasional test_ftplib failure, following r79226. ........ ................ r79289 | antoine.pitrou | 2010-03-22 16:07:09 +0100 (lun., 22 mars 2010) | 3 lines Fix a blunder in r79287. This part is, obviously, poorly tested (if at all). ................
Diffstat (limited to 'Lib/shutil.py')
0 files changed, 0 insertions, 0 deletions