openstack/swift
Code Issues Proposed changes

Bump up our minimum eventlet version

Browse Source 
We need 0.25.0 for py3 support, and increasing it for both is simplest.

Also drag forward dnspython, as newer eventlet requires a newer
dnspython. Note that we still don't explicitly list it as a dependency
for py3; rather, it's been getting installed as a requirement for
eventlet.

Change-Id: If933b713bdd1dfc348959771d60c0756a9a94477
This commit is contained in:
Tim Burke 2019-06-17 13:22:04 -07:00
parent 9f1ef35630
commit 0ebfeddf65
3 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lower-constraints.txt
View File

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

6
requirements.txt
View File

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

12
swift/obj/ssync_receiver.py
View File

@ -130,17 +130,7 @@ class Receiver(object):
# raised during processing because otherwise the sender could send for # raised during processing because otherwise the sender could send for
# quite some time before realizing it was all in vain. # quite some time before realizing it was all in vain.
self.disconnect = True self.disconnect = True
try: self.initialize_request()
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
def __call__(self): def __call__(self):
""" """