From 4b3ba4d693782a18edf9e9a93ab9810753d87d9e Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Mon, 9 Jun 2014 09:39:57 -0400 Subject: [PATCH 1/4] Upgrade `requests` module to 2.3.0 --- docs/shared/requirements.txt | 2 +- requirements/edx/base.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/shared/requirements.txt b/docs/shared/requirements.txt index 23c6dbfdfd..5abf563a37 100644 --- a/docs/shared/requirements.txt +++ b/docs/shared/requirements.txt @@ -50,7 +50,7 @@ python-memcached==1.48 python-openid==2.2.5 pytz==2012h PyYAML==3.10 -requests==1.2.3 +requests==2.3.0 Shapely==1.2.16 sorl-thumbnail==11.12 South==0.7.6 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 08c38da769..cb37d78c15 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -65,7 +65,7 @@ python-social-auth==0.1.23 pytz==2012h pysrt==0.4.7 PyYAML==3.10 -requests==1.2.3 +requests==2.3.0 requests-oauthlib==0.4.0 scipy==0.11.0 Shapely==1.2.16 From 97af6a003d06441f0070839860ebf00646d345bb Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Mon, 9 Jun 2014 14:19:12 -0400 Subject: [PATCH 2/4] Upgrade `requests-oauthlib` to 0.4.1 --- requirements/edx/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index cb37d78c15..c6a3adec5f 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -66,7 +66,7 @@ pytz==2012h pysrt==0.4.7 PyYAML==3.10 requests==2.3.0 -requests-oauthlib==0.4.0 +requests-oauthlib==0.4.1 scipy==0.11.0 Shapely==1.2.16 singledispatch==3.4.0.2 From d7192869711d9f1f4180570471557cb982cdfb43 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Tue, 10 Jun 2014 10:21:16 -0400 Subject: [PATCH 3/4] Upgrade `oauthlib` to 0.6.3 --- docs/shared/requirements.txt | 2 +- requirements/edx/base.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/shared/requirements.txt b/docs/shared/requirements.txt index 5abf563a37..42a3eeaf08 100644 --- a/docs/shared/requirements.txt +++ b/docs/shared/requirements.txt @@ -37,7 +37,7 @@ Markdown==2.2.1 mock==1.0.1 networkx==1.7 nltk==2.0.4 -oauthlib==0.5.1 +oauthlib==0.6.3 paramiko==1.9.0 path.py==3.0.1 Pillow==1.7.8 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index c6a3adec5f..9d776de8a1 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -47,7 +47,7 @@ mongoengine==0.7.10 networkx==1.7 nltk==2.0.4 nose==1.3.3 -oauthlib==0.5.1 +oauthlib==0.6.3 paramiko==1.9.0 path.py==3.0.1 Pillow==1.7.8 From cfec580a63281d30795e74396e456b5621ede6b5 Mon Sep 17 00:00:00 2001 From: Oleg Marshev Date: Wed, 11 Jun 2014 11:41:03 +0300 Subject: [PATCH 4/4] Add argument. --- common/djangoapps/terrain/stubs/lti.py | 2 +- common/lib/xmodule/xmodule/lti_2_util.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/djangoapps/terrain/stubs/lti.py b/common/djangoapps/terrain/stubs/lti.py index 87ed5ef214..3bea875b38 100644 --- a/common/djangoapps/terrain/stubs/lti.py +++ b/common/djangoapps/terrain/stubs/lti.py @@ -256,7 +256,7 @@ class StubLtiHandler(StubHttpRequestHandler): sha1 = hashlib.sha1() sha1.update(body) oauth_body_hash = unicode(base64.b64encode(sha1.digest())) # pylint: disable=too-many-function-args - params = client.get_oauth_params() + params = client.get_oauth_params(None) params.append((u'oauth_body_hash', oauth_body_hash)) mock_request = mock.Mock( uri=unicode(urllib.unquote(url)), diff --git a/common/lib/xmodule/xmodule/lti_2_util.py b/common/lib/xmodule/xmodule/lti_2_util.py index 309c76e29e..dbfda77787 100644 --- a/common/lib/xmodule/xmodule/lti_2_util.py +++ b/common/lib/xmodule/xmodule/lti_2_util.py @@ -106,7 +106,7 @@ class LTI20ModuleMixin(object): log.debug("[LTI] oauth_body_hash = {}".format(oauth_body_hash)) client_key, client_secret = self.get_client_key_secret() client = Client(client_key, client_secret) - params = client.get_oauth_params() + params = client.get_oauth_params(None) params.append((u'oauth_body_hash', oauth_body_hash)) mock_request = mock.Mock( uri=unicode(urllib.unquote(request.url)),