Add support for Python3.7

Upgrade HTTPretty to version that supports Python3.7
Upgrade Recurly to version that supports Python3.7
Change the way timeout is simulated - return error instead of raising ssl.SSLError

Author: pgrzesik

mocurly/core.py

@@ -3,16 +3,16 @@
 Exposes the main mocurly class which is the gateway into setting up the mocurly
 context.
 """
-import recurly
-import re
-import ssl
 import functools
-from six.moves.urllib.parse import urlparse, parse_qs, unquote
+import re
+
+import recurly
 from httpretty import HTTPretty
+from six.moves.urllib.parse import parse_qs, unquote, urlparse
 
-from .utils import deserialize
-from .errors import ResponseError
 from .backend import clear_backends
+from .errors import ResponseError
+from .utils import deserialize
 
 
 class mocurly(object):
@@ -260,11 +260,12 @@ def __init__(self, mocurly_instance):
 
     def __call__(self, func):
         def wrapped(request, uri, headers, **kwargs):
+            error_response_body = 'The read operation timed out'
             # If we want to timeout the request, timeout, but only if we aren't
             # going to allow the POST
             if (self.mocurly_instance.should_timeout(request) and
                     not self.mocurly_instance.should_timeout_successful_post(request)):
-                raise ssl.SSLError('The read operation timed out')
+                return 502, headers, error_response_body
 
             try:
                 return_val = func(request, uri, headers, **kwargs)
@@ -275,7 +276,7 @@ def wrapped(request, uri, headers, **kwargs):
                     return exc.status_code, headers, exc.response_body
 
             if self.mocurly_instance.should_timeout_successful_post(request):
-                raise ssl.SSLError('The read operation timed out')
+                return 502, headers, error_response_body
 
             return return_val
         return wrapped

requirements.txt

@@ -1,6 +1,7 @@
-httpretty>=0.8,<=0.8.10
-recurly>=2.2.23
+httpretty>=0.9.4
+recurly>=2.9.0,<3.0.0
 jinja2
 six
 pytz
 python-dateutil
+iso8601

tests/test_core.py

@@ -1,10 +1,11 @@
 import unittest
-import ssl
-import recurly
-recurly.API_KEY = 'blah'
 
 import mocurly
 import mocurly.backend
+import recurly
+
+recurly.API_KEY = 'blah'
+
 
 class TestCore(unittest.TestCase):
     def setUp(self):
@@ -58,7 +59,7 @@ def test_timeout(self):
         mocurly_.start_timeout()
 
         self.assertFalse(mocurly.backend.accounts_backend.has_object(self.base_account_data['account_code']))
-        self.assertRaises(ssl.SSLError, recurly.Account(**self.base_account_data).save)
+        self.assertRaises(recurly.errors.BadGatewayError, recurly.Account(**self.base_account_data).save)
         self.assertFalse(mocurly.backend.accounts_backend.has_object(self.base_account_data['account_code']))
 
         mocurly_.stop_timeout()
@@ -76,7 +77,7 @@ def test_timeout_successful_post(self):
         mocurly_.start_timeout_successful_post()
 
         self.assertFalse(mocurly.backend.accounts_backend.has_object(self.base_account_data['account_code']))
-        self.assertRaises(ssl.SSLError, recurly.Account(**self.base_account_data).save)
+        self.assertRaises(recurly.errors.BadGatewayError, recurly.Account(**self.base_account_data).save)
         self.assertTrue(mocurly.backend.accounts_backend.has_object(self.base_account_data['account_code']))
 
         mocurly_.stop_timeout_successful_post()
@@ -101,7 +102,7 @@ def timeout_filter(request):
         self.assertFalse(mocurly.backend.accounts_backend.has_object(self.base_account_data['account_code']))
         recurly.Account(**self.base_account_data).save()
         self.assertTrue(mocurly.backend.accounts_backend.has_object(self.base_account_data['account_code']))
-        self.assertRaises(ssl.SSLError, recurly.Account.get, self.base_account_data['account_code'])
+        self.assertRaises(recurly.errors.BadGatewayError, recurly.Account.get, self.base_account_data['account_code'])
 
         mocurly_.stop_timeout()
 
@@ -126,7 +127,7 @@ def timeout_filter(request):
 
         self.assertEqual(len(mocurly.backend.transactions_backend.datastore), 0)
         new_transaction = recurly.Transaction(account=new_account, amount_in_cents=20, currency='USD')
-        self.assertRaises(ssl.SSLError, new_transaction.save)
+        self.assertRaises(recurly.errors.BadGatewayError, new_transaction.save)
         self.assertEqual(len(mocurly.backend.transactions_backend.datastore), 1)
 
         mocurly_.stop_timeout_successful_post()