Merge pull request #2997 from diox/update-curling

Update curling to 0.4.0, getting rid of oauth2 (bug 846349)

mkt/developers/api_payments.py

@@ -2,7 +2,6 @@
 from django.core.urlresolvers import reverse
 
 import commonware
-from curling.lib import HttpClientError, HttpServerError
 from rest_framework import status
 from rest_framework.mixins import (CreateModelMixin, DestroyModelMixin,
                                    ListModelMixin, RetrieveModelMixin,
@@ -14,6 +13,7 @@
                                         Serializer,
                                         ValidationError)
 from rest_framework.viewsets import GenericViewSet
+from slumber.exceptions import HttpClientError, HttpServerError
 from tower import ugettext as _
 
 import mkt

mkt/developers/forms_payments.py

@@ -9,7 +9,7 @@
 
 import commonware
 import happyforms
-from curling.lib import HttpClientError
+from slumber.exceptions import HttpClientError
 from tower import ugettext as _, ugettext_lazy as _lazy
 
 import mkt

mkt/developers/tests/test_api_payments.py

@@ -5,10 +5,10 @@
 from django.test.client import RequestFactory
 from django.test.utils import override_settings
 
-from curling.lib import HttpClientError, HttpServerError
 from mock import Mock, patch
 from nose.tools import eq_, ok_
 from rest_framework.request import Request
+from slumber.exceptions import HttpClientError, HttpServerError
 
 import mkt
 from mkt.api.tests.test_oauth import RestOAuth

mkt/developers/tests/test_forms_payments.py

@@ -1,9 +1,9 @@
 from django.test.client import RequestFactory
 
 import mock
-from curling.lib import HttpClientError
 from nose.tools import eq_, ok_
 from pyquery import PyQuery as pq
+from slumber.exceptions import HttpClientError
 
 import mkt
 import mkt.site.tests

mkt/developers/tests/test_views_payments.py

@@ -6,10 +6,10 @@
 from django.core.urlresolvers import reverse
 
 import mock
-from curling.lib import HttpClientError
 from mock import ANY
 from nose.tools import eq_, ok_
 from pyquery import PyQuery as pq
+from slumber.exceptions import HttpClientError
 from waffle.models import Switch
 
 import mkt

mkt/developers/views_payments.py

@@ -12,7 +12,7 @@
 import commonware
 import jinja2
 import waffle
-from curling.lib import HttpClientError
+from slumber.exceptions import HttpClientError
 from tower import ugettext as _
 from waffle.decorators import waffle_switch
 

mkt/lookup/tests/test_views.py

@@ -10,7 +10,6 @@
 
 import mock
 from babel import numbers
-from curling.lib import HttpClientError
 from nose.tools import eq_, ok_
 from pyquery import PyQuery as pq
 from slumber import exceptions
@@ -283,7 +282,8 @@ def test_bango_portal_redirect(self, api):
     def test_bango_portal_redirect_api_error(self, api):
         message = 'Something went wrong.'
         error = {'__all__': [message]}
-        api.bango.login.post.side_effect = HttpClientError(content=error)
+        api.bango.login.post.side_effect = exceptions.HttpClientError(
+            content=error)
         res = self.client.get(self.portal_url, follow=True)
         eq_(res.redirect_chain, [('http://testserver/lookup/', 302)])
         ok_(message in [msg.message for msg in res.context['messages']][0])

requirements/prod.txt

@@ -18,7 +18,7 @@ chardet==2.3.0
 commonware==0.4.3
 # cssutils is required by app-validator
 cssutils==0.9.7b3
-curling==0.3.12
+curling==0.4
 # defusedxml is required by djangorestframework
 defusedxml==0.4.1
 dennis==0.4.2
@@ -72,9 +72,7 @@ m2secret==0.1.1
 ndg-httpsclient==0.3.3
 newrelic==2.20.1.18
 nose==1.3.4
-# oauth2 is required by curling
-oauth2==1.5.211
-oauthlib==0.6.2
+oauthlib==0.7.2
 # ordereddict is required by kombu
 ordereddict==1.1
 # polib is required by dennis