Merge "Bump up our minimum eventlet version"

lower-constraints.txt

@@ -14,11 +14,11 @@ cmd2==0.8.1
 coverage==3.6
 cryptography==2.0.2
 debtcollector==1.19.0
-dnspython==1.14.0
+dnspython==1.15.0
 docutils==0.11
 dulwich==0.19.0
 enum-compat==0.0.2
-eventlet==0.17.4
+eventlet==0.25.0
 extras==1.0.0
 fixtures==3.0.0
 flake8==2.5.5
@@ -76,7 +76,7 @@ reno==1.8.0
 requests==2.14.2
 requests-mock==1.2.0
 rfc3986==1.1.0
-six==1.9.0
+six==1.10.0
 smmap2==2.0.3
 snowballstemmer==1.2.1
 Sphinx==1.6.2

requirements.txt

@@ -2,14 +2,14 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-dnspython>=1.14.0;python_version=='2.7' # http://www.dnspython.org/LICENSE
-eventlet>=0.17.4,!=0.23.0               # MIT
+dnspython>=1.15.0;python_version=='2.7' # http://www.dnspython.org/LICENSE
+eventlet>=0.25.0                        # MIT
 greenlet>=0.3.1
 netifaces>=0.8,!=0.10.0,!=0.10.1
 PasteDeploy>=1.3.3
 lxml>=3.4.1
 requests>=2.14.2                        # Apache-2.0
-six>=1.9.0
+six>=1.10.0
 xattr>=0.4;sys_platform!='win32'        # MIT
 PyECLib>=1.3.1                          # BSD
 cryptography>=2.0.2                     # BSD/Apache-2.0

swift/obj/ssync_receiver.py

@@ -130,17 +130,7 @@ class Receiver(object):
         # raised during processing because otherwise the sender could send for
         # quite some time before realizing it was all in vain.
         self.disconnect = True
-        try:
-            self.initialize_request()
-        except swob.HTTPException:
-            # Old (pre-0.18.0) eventlet would try to drain the request body
-            # in a way that's prone to blowing up when the client has
-            # disconnected. Trick it into skipping that so we don't trip
-            #   ValueError: invalid literal for int() with base 16
-            # in tests. Note we disconnect shortly after receiving a non-200
-            # response in the sender code, so this is not *so* crazy to do.
-            request.environ['wsgi.input'].chunked_input = False
-            raise
+        self.initialize_request()
 
     def __call__(self):
         """