[#1819] Upgrade Requests to 2.3.x

Only a minor change in the resource proxy extension (look like the content-length header is no longer added by default).
ckan · Jul 1, 2014 · bc41fee · bc41fee
1 parent bf07d13
commit bc41fee
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/ckanext/resourceproxy/controller.py b/ckanext/resourceproxy/controller.py
@@ -41,7 +41,7 @@ def proxy_resource(context, data_dict):
             did_get = True
         r.raise_for_status()
 
-        cl = r.headers['content-length']
+        cl = r.headers.get('content-length')
         if cl and int(cl) > MAX_FILE_SIZE:
             base.abort(409, '''Content is too large to be proxied. Allowed
                 file size: {allowed}, Content-Length: {actual}.'''.format(

diff --git a/requirements.in b/requirements.in
@@ -19,7 +19,7 @@ pyutilib.component.core==4.5.3
 repoze.who-friendlyform==1.0.8
 repoze.who.plugins.openid==0.5.3
 repoze.who==1.0.19
-requests==1.1.0
+requests==2.3.0
 Routes==1.13
 solrpy==0.9.5
 sqlalchemy-migrate==0.7.2

diff --git a/requirements.txt b/requirements.txt
@@ -33,7 +33,7 @@ repoze.lru==0.6
 repoze.who==1.0.19
 repoze.who-friendlyform==1.0.8
 repoze.who.plugins.openid==0.5.3
-requests==1.1.0
+requests==2.3.0
 simplejson==3.3.1
 solrpy==0.9.5
 sqlalchemy-migrate==0.7.2