0.6.5

timeout changed to connect_timeout and read_timeout
changed due to 12s bet delay on some markets
future will be able to have read_timeout as param for request
tests updated

betfairlightweight/__init__.py

@@ -3,4 +3,4 @@
 from .streaming import StreamListener
 
 
-__version__ = '0.6.4'
+__version__ = '0.6.5'

betfairlightweight/endpoints/account.py

@@ -7,7 +7,7 @@
 class Account(BaseEndpoint):
 
     URI = 'AccountAPING/v1.0/'
-    timeout = 6.05
+    connect_timeout = 6.05
 
     def get_account_funds(self, params=None, session=None):
         date_time_sent = datetime.datetime.utcnow()

betfairlightweight/endpoints/baseendpoint.py

@@ -6,7 +6,8 @@
 
 class BaseEndpoint:
 
-    timeout = 3.05
+    connect_timeout = 3.05
+    read_timeout = 16
     _error = APIError
 
     def __init__(self, parent):
@@ -25,7 +26,7 @@ def request(self, method, params, session):
         request = self.create_req(method, params)
         try:
             response = session.post(self.url, data=request, headers=self.client.request_headers,
-                                    timeout=(self.timeout, 12))
+                                    timeout=(self.connect_timeout, self.read_timeout))
         except ConnectionError:
             raise APIError(None, method, params, 'ConnectionError')
         except Exception as e:

betfairlightweight/endpoints/navigation.py

@@ -12,7 +12,7 @@ def request(self, method=None, params=None, session=None):
         session = session or self.client.session
         try:
             response = session.get(self.url, headers=self.client.request_headers,
-                                   timeout=(self.timeout, 12))
+                                   timeout=(self.connect_timeout, self.read_timeout))
         except ConnectionError:
             raise APIError(None, method, params, 'ConnectionError')
         except Exception as e:

tests/test_account.py

@@ -10,7 +10,8 @@ class AccountInit(unittest.TestCase):
     def test_base_endpoint_init(self):
         client = APIClient('username', 'password', 'app_key')
         account = Account(client)
-        assert account.timeout == 6.05
+        assert account.connect_timeout == 6.05
+        assert account.read_timeout == 16
         assert account._error == APIError
         assert account.client == client
         assert account.URI == 'AccountAPING/v1.0/'

tests/test_baseendpoint.py

@@ -14,7 +14,8 @@ class BaseEndpointInit(unittest.TestCase):
     def test_base_endpoint_init(self):
         client = APIClient('username', 'password', 'app_key')
         base_endpoint = BaseEndpoint(client)
-        assert base_endpoint.timeout == 3.05
+        assert base_endpoint.connect_timeout == 3.05
+        assert base_endpoint.read_timeout == 16
         assert base_endpoint._error == APIError
         assert base_endpoint.client == client
 
@@ -48,7 +49,7 @@ def test_request(self, mock_post, mock_request_headers, mock_cert, mock_create_r
         response = self.base_endpoint.request(None, None, None)
 
         mock_post.assert_called_once_with(url, data=mock_create_req(),
-                                          headers=mock_request_headers, timeout=(3.05, 12))
+                                          headers=mock_request_headers, timeout=(3.05, 16))
         assert response == mock_response
 
     def test_base_endpoint_error_handler(self):

tests/test_betting.py

@@ -14,7 +14,8 @@ class BettingInit(unittest.TestCase):
     def test_base_endpoint_init(self):
         client = APIClient('username', 'password', 'app_key')
         betting = Betting(client)
-        assert betting.timeout == 3.05
+        assert betting.connect_timeout == 3.05
+        assert betting.read_timeout == 16
         assert betting._error == APIError
         assert betting.client == client
         now = datetime.datetime.now()

tests/test_inplayservice.py

@@ -12,7 +12,8 @@ def setUp(self):
         self.in_play_service = InPlayService(self.client)
 
     def test_init(self):
-        assert self.in_play_service.timeout == 3.05
+        assert self.in_play_service.connect_timeout == 3.05
+        assert self.in_play_service.read_timeout == 16
         assert self.in_play_service._error == APIError
         assert self.in_play_service.client == self.client
 

tests/test_navigation.py

@@ -13,7 +13,8 @@ class NavigationInit(unittest.TestCase):
     def test_base_endpoint_init(self):
         client = APIClient('username', 'password', 'app_key')
         navigation = Navigation(client)
-        assert navigation.timeout == 3.05
+        assert navigation.connect_timeout == 3.05
+        assert navigation.read_timeout == 16
         assert navigation._error == APIError
         assert navigation.client == client
 
@@ -48,7 +49,7 @@ def test_request(self, mock_get, mock_request_headers, mock_cert):
         url = 'https://api.betfair.com/exchange/betting/rest/v1/en/navigation/menu.json'
         self.navigation.request()
 
-        mock_get.assert_called_once_with(url, headers=mock_request_headers, timeout=(3.05, 12))
+        mock_get.assert_called_once_with(url, headers=mock_request_headers, timeout=(3.05, 16))
 
     @mock.patch('betfairlightweight.baseclient.BaseClient.cert')
     @mock.patch('betfairlightweight.baseclient.BaseClient.request_headers')
@@ -68,7 +69,7 @@ def test_request_error(self, mock_get, mock_request_headers, mock_cert):
         with self.assertRaises(APIError):
             self.navigation.request()
 
-        mock_get.assert_called_once_with(url, headers=mock_request_headers, timeout=(3.05, 12))
+        mock_get.assert_called_once_with(url, headers=mock_request_headers, timeout=(3.05, 16))
 
     @mock.patch('betfairlightweight.baseclient.BaseClient.cert')
     @mock.patch('betfairlightweight.baseclient.BaseClient.request_headers')
@@ -88,7 +89,7 @@ def test_request_random(self, mock_get, mock_request_headers, mock_cert):
         with self.assertRaises(APIError):
             self.navigation.request()
 
-        mock_get.assert_called_once_with(url, headers=mock_request_headers, timeout=(3.05, 12))
+        mock_get.assert_called_once_with(url, headers=mock_request_headers, timeout=(3.05, 16))
 
     def test_url(self):
         assert self.navigation.url == self.navigation.client.navigation_uri

tests/test_racecard.py

@@ -12,7 +12,7 @@ def setUp(self):
         self.race_card = RaceCard(self.client)
 
     def test_init(self):
-        assert self.race_card.timeout == 3.05
+        assert self.race_card.connect_timeout == 3.05
         assert self.race_card._error == APIError
         assert self.race_card.client == self.client
         assert self.race_card.app_key is None

tests/test_scores.py

@@ -13,7 +13,7 @@ class ScoresInit(unittest.TestCase):
     def test_base_endpoint_init(self):
         client = APIClient('username', 'password', 'app_key')
         scores = Scores(client)
-        assert scores.timeout == 3.05
+        assert scores.connect_timeout == 3.05
         assert scores._error == APIError
         assert scores.client == client
         assert scores.URI == 'ScoresAPING/v1.0/'