[Python-modules-commits] r17269 - in packages/python-eventlet/trunk/debian (2 files)

[stefanor at users.alioth.debian.org]

    Date: Thursday, June 2, 2011 @ 14:34:05
  Author: stefanor
Revision: 17269

New retry-on-timeout.patch, fixing tests

Modified:
  packages/python-eventlet/trunk/debian/changelog
  packages/python-eventlet/trunk/debian/patches/retry-on-timeout.patch

Modified: packages/python-eventlet/trunk/debian/changelog
===================================================================
--- packages/python-eventlet/trunk/debian/changelog	2011-06-01 23:35:01 UTC (rev 17268)
+++ packages/python-eventlet/trunk/debian/changelog	2011-06-02 14:34:05 UTC (rev 17269)
@@ -1,4 +1,4 @@
-python-eventlet (0.9.15-1) UNRELEASED; urgency=low
+python-eventlet (0.9.15-1) unstable; urgency=low
 
   * New upstream release.
     - Drop all patches, accepted upstream.
@@ -10,8 +10,9 @@
   * reuseaddr.patch: The logic for deciding whether to use SO_REUSEADDR was
     inverted.
   * retry-on-timeout.patch: If an operation times out, try one last time.
+    (LP: #771512)
 
- -- Stefano Rivera <stefanor at debian.org>  Sun, 27 Feb 2011 14:26:40 +0200
+ -- Stefano Rivera <stefanor at debian.org>  Thu, 02 Jun 2011 16:18:16 +0200
 
 python-eventlet (0.9.14-1) unstable; urgency=low
 

Modified: packages/python-eventlet/trunk/debian/patches/retry-on-timeout.patch
===================================================================
--- packages/python-eventlet/trunk/debian/patches/retry-on-timeout.patch	2011-06-01 23:35:01 UTC (rev 17268)
+++ packages/python-eventlet/trunk/debian/patches/retry-on-timeout.patch	2011-06-02 14:34:05 UTC (rev 17269)
@@ -1,11 +1,11 @@
 Description: If an operation times out, try one last time.
  This addresses a problem where a timeout fires even though the
  connection was actually correctly established.
-Origin: Chris Behrens, https://bitbucket-assetroot.s3.amazonaws.com/which_linden/eventlet/20110513/87/eventlet-socket-timeout.patch
+Origin: Chris Behrens, https://bitbucket-assetroot.s3.amazonaws.com/which_linden/eventlet/20110601/87/eventlet-socket-timeout.diff
 Bug: https://bitbucket.org/which_linden/eventlet/issue/87/socket-connects-are-incorrectly-reported
 Bug-Ubuntu: https://launchpad.net/bugs/771512
 Reviewed-By: Soren Hansen <soren at ubuntu.com>
-Last-Update: 2011-05-12
+Last-Update: 2011-06-01
 
 --- a/eventlet/greenio.py
 +++ b/eventlet/greenio.py
@@ -168,3 +168,25 @@
  
      def setblocking(self, flag):
          if flag:
+--- a/tests/greenio_test.py
++++ b/tests/greenio_test.py
+@@ -133,7 +133,8 @@
+             self.assertEqual(e.args[0], 'timed out')
+ 
+     def test_recvfrom_into_timeout(self):
+-        buf = buffer(array.array('B'))
++        buf = array.array('B')
++        buf.fromstring('\0')
+ 
+         gs = greenio.GreenSocket(
+             socket.socket(socket.AF_INET, socket.SOCK_DGRAM))
+@@ -148,7 +149,8 @@
+             self.assertEqual(e.args[0], 'timed out')
+ 
+     def test_recv_into_timeout(self):
+-        buf = buffer(array.array('B'))
++        buf = array.array('B')
++        buf.fromstring('\0')
+ 
+         listener = greenio.GreenSocket(socket.socket())
+         listener.bind(('', 0))