Merge "Drop compatibility with WebOb < 1.8.0"
This commit is contained in:
@@ -14,18 +14,6 @@
|
||||
from webob import acceptparse
|
||||
|
||||
|
||||
if hasattr(acceptparse, 'create_accept_header'):
|
||||
# WebOb >= 1.8.0
|
||||
NoHeaderType = getattr(acceptparse, 'AcceptNoHeader')
|
||||
ValidHeaderType = getattr(acceptparse, 'AcceptValidHeader')
|
||||
create_accept_header = getattr(acceptparse, 'create_accept_header')
|
||||
else:
|
||||
# WebOb < 1.8.0
|
||||
NoHeaderType = getattr(acceptparse, 'MIMENilAccept')
|
||||
ValidHeaderType = getattr(acceptparse, 'MIMEAccept')
|
||||
|
||||
def create_accept_header(header_value):
|
||||
if not header_value:
|
||||
return NoHeaderType()
|
||||
else:
|
||||
return ValidHeaderType(header_value)
|
||||
NoHeaderType = getattr(acceptparse, 'AcceptNoHeader')
|
||||
ValidHeaderType = getattr(acceptparse, 'AcceptValidHeader')
|
||||
create_accept_header = getattr(acceptparse, 'create_accept_header')
|
||||
|
@@ -26,6 +26,6 @@ pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2,>=1.0.0 # BSD
|
||||
keystonemiddleware>=9.5.0 # Apache-2.0
|
||||
SQLAlchemy>=1.4.0 # MIT
|
||||
stevedore>=1.20.0 # Apache-2.0
|
||||
WebOb>=1.7.1 # MIT
|
||||
WebOb>=1.8.0 # MIT
|
||||
castellan >= 1.2.1 # Apache-2.0
|
||||
microversion-parse>=0.2.1 # Apache-2.0
|
||||
|
Reference in New Issue
Block a user