Merge pull request #317 from liampauling/release/2.6.0

_response removed from base resource, potential for memory leaks with…
betcode-org · Jul 9, 2020 · 737e17f · 737e17f
2 parents 869f0fb + 4e2e407
commit 737e17f
Show file tree

Hide file tree

Showing 16 changed files with 55 additions and 91 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,17 @@
 Release History
 ---------------
 
+2.6.0 (2020-07-09)
++++++++++++++++++++
+
+**Improvements**
+
+- Response (_response) removed from BaseResources due to potential memory leaks
+
+**Bug Fixes**
+
+- marketType bug fix (politics markets)
+
 2.5.0 (2020-06-22)
 +++++++++++++++++++
 

diff --git a/betfairlightweight/__version__.py b/betfairlightweight/__version__.py
@@ -1,6 +1,6 @@
 __title__ = "betfairlightweight"
 __description__ = "Lightweight python wrapper for Betfair API-NG"
 __url__ = "https://github.com/liampauling/betfair"
-__version__ = "2.5.0"
+__version__ = "2.6.0"
 __author__ = "Liam Pauling"
 __license__ = "MIT"
diff --git a/betfairlightweight/endpoints/account.py b/betfairlightweight/endpoints/account.py
@@ -34,7 +34,7 @@ def get_account_funds(
         method = "%s%s" % (self.URI, "getAccountFunds")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response, response_json, resources.AccountFunds, elapsed_time, lightweight
+            response_json, resources.AccountFunds, elapsed_time, lightweight
         )
 
     def get_account_details(
@@ -53,7 +53,7 @@ def get_account_details(
         method = "%s%s" % (self.URI, "getAccountDetails")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response, response_json, resources.AccountDetails, elapsed_time, lightweight
+            response_json, resources.AccountDetails, elapsed_time, lightweight
         )
 
     def get_account_statement(
@@ -85,11 +85,7 @@ def get_account_statement(
         method = "%s%s" % (self.URI, "getAccountStatement")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response,
-            response_json,
-            resources.AccountStatementResult,
-            elapsed_time,
-            lightweight,
+            response_json, resources.AccountStatementResult, elapsed_time, lightweight,
         )
 
     def list_currency_rates(
@@ -111,7 +107,7 @@ def list_currency_rates(
         method = "%s%s" % (self.URI, "listCurrencyRates")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response, response_json, resources.CurrencyRate, elapsed_time, lightweight
+            response_json, resources.CurrencyRate, elapsed_time, lightweight
         )
 
     def transfer_funds(self, session: requests.Session = None) -> None:

diff --git a/betfairlightweight/endpoints/baseendpoint.py b/betfairlightweight/endpoints/baseendpoint.py
@@ -82,7 +82,6 @@ def _error_handler(
 
     def process_response(
         self,
-        response: requests.Response,
         response_json: Union[dict, list],
         resource: Type[BaseResource],
         elapsed_time: float,
@@ -106,15 +105,12 @@ def process_response(
             return result
         elif isinstance(result, list):
             try:
-                return [
-                    resource(elapsed_time=elapsed_time, _response=response, **x)
-                    for x in result
-                ]
+                return [resource(elapsed_time=elapsed_time, **x) for x in result]
             except TypeError:
                 raise InvalidResponse(response=result)
         else:
             try:
-                return resource(elapsed_time=elapsed_time, _response=response, **result)
+                return resource(elapsed_time=elapsed_time, **result)
             except TypeError:
                 raise InvalidResponse(response=result)
 

diff --git a/betfairlightweight/endpoints/betting.py b/betfairlightweight/endpoints/betting.py
@@ -36,11 +36,7 @@ def list_event_types(
         method = "%s%s" % (self.URI, "listEventTypes")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response,
-            response_json,
-            resources.EventTypeResult,
-            elapsed_time,
-            lightweight,
+            response_json, resources.EventTypeResult, elapsed_time, lightweight,
         )
 
     def list_competitions(
@@ -65,11 +61,7 @@ def list_competitions(
         method = "%s%s" % (self.URI, "listCompetitions")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response,
-            response_json,
-            resources.CompetitionResult,
-            elapsed_time,
-            lightweight,
+            response_json, resources.CompetitionResult, elapsed_time, lightweight,
         )
 
     def list_time_ranges(
@@ -96,11 +88,7 @@ def list_time_ranges(
         method = "%s%s" % (self.URI, "listTimeRanges")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response,
-            response_json,
-            resources.TimeRangeResult,
-            elapsed_time,
-            lightweight,
+            response_json, resources.TimeRangeResult, elapsed_time, lightweight,
         )
 
     def list_events(
@@ -125,7 +113,7 @@ def list_events(
         method = "%s%s" % (self.URI, "listEvents")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response, response_json, resources.EventResult, elapsed_time, lightweight
+            response_json, resources.EventResult, elapsed_time, lightweight
         )
 
     def list_market_types(
@@ -150,11 +138,7 @@ def list_market_types(
         method = "%s%s" % (self.URI, "listMarketTypes")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response,
-            response_json,
-            resources.MarketTypeResult,
-            elapsed_time,
-            lightweight,
+            response_json, resources.MarketTypeResult, elapsed_time, lightweight,
         )
 
     def list_countries(
@@ -179,7 +163,7 @@ def list_countries(
         method = "%s%s" % (self.URI, "listCountries")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response, response_json, resources.CountryResult, elapsed_time, lightweight
+            response_json, resources.CountryResult, elapsed_time, lightweight
         )
 
     def list_venues(
@@ -204,7 +188,7 @@ def list_venues(
         method = "%s%s" % (self.URI, "listVenues")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response, response_json, resources.VenueResult, elapsed_time, lightweight
+            response_json, resources.VenueResult, elapsed_time, lightweight
         )
 
     def list_market_catalogue(
@@ -236,11 +220,7 @@ def list_market_catalogue(
         method = "%s%s" % (self.URI, "listMarketCatalogue")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response,
-            response_json,
-            resources.MarketCatalogue,
-            elapsed_time,
-            lightweight,
+            response_json, resources.MarketCatalogue, elapsed_time, lightweight,
         )
 
     def list_market_book(
@@ -287,7 +267,7 @@ def list_market_book(
         method = "%s%s" % (self.URI, "listMarketBook")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response, response_json, resources.MarketBook, elapsed_time, lightweight
+            response_json, resources.MarketBook, elapsed_time, lightweight
         )
 
     def list_runner_book(
@@ -338,7 +318,6 @@ def list_runner_book(
         method = "%s%s" % (self.URI, "listRunnerBook")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response,
             response_json,
             resources.MarketBook,
             elapsed_time,
@@ -385,7 +364,7 @@ def list_current_orders(
         method = "%s%s" % (self.URI, "listCurrentOrders")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response, response_json, resources.CurrentOrders, elapsed_time, lightweight
+            response_json, resources.CurrentOrders, elapsed_time, lightweight
         )
 
     def list_cleared_orders(
@@ -437,7 +416,7 @@ def list_cleared_orders(
         method = "%s%s" % (self.URI, "listClearedOrders")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response, response_json, resources.ClearedOrders, elapsed_time, lightweight
+            response_json, resources.ClearedOrders, elapsed_time, lightweight
         )
 
     def list_market_profit_and_loss(
@@ -466,11 +445,7 @@ def list_market_profit_and_loss(
         method = "%s%s" % (self.URI, "listMarketProfitAndLoss")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response,
-            response_json,
-            resources.MarketProfitLoss,
-            elapsed_time,
-            lightweight,
+            response_json, resources.MarketProfitLoss, elapsed_time, lightweight,
         )
 
     def place_orders(
@@ -506,7 +481,7 @@ def place_orders(
         method = "%s%s" % (self.URI, "placeOrders")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response, response_json, resources.PlaceOrders, elapsed_time, lightweight
+            response_json, resources.PlaceOrders, elapsed_time, lightweight
         )
 
     def cancel_orders(
@@ -534,7 +509,7 @@ def cancel_orders(
         method = "%s%s" % (self.URI, "cancelOrders")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response, response_json, resources.CancelOrders, elapsed_time, lightweight
+            response_json, resources.CancelOrders, elapsed_time, lightweight
         )
 
     def update_orders(
@@ -561,7 +536,7 @@ def update_orders(
         method = "%s%s" % (self.URI, "updateOrders")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response, response_json, resources.UpdateOrders, elapsed_time, lightweight
+            response_json, resources.UpdateOrders, elapsed_time, lightweight
         )
 
     def replace_orders(
@@ -596,5 +571,5 @@ def replace_orders(
         method = "%s%s" % (self.URI, "replaceOrders")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response, response_json, resources.ReplaceOrders, elapsed_time, lightweight
+            response_json, resources.ReplaceOrders, elapsed_time, lightweight
         )
diff --git a/betfairlightweight/endpoints/inplayservice.py b/betfairlightweight/endpoints/inplayservice.py
@@ -37,7 +37,7 @@ def get_event_timeline(
             params=params, session=session, url=url
         )
         return self.process_response(
-            response, response_json, resources.EventTimeline, elapsed_time, lightweight
+            response_json, resources.EventTimeline, elapsed_time, lightweight
         )
 
     def get_event_timelines(
@@ -67,7 +67,7 @@ def get_event_timelines(
             params=params, session=session, url=url
         )
         return self.process_response(
-            response, response_json, resources.EventTimeline, elapsed_time, lightweight
+            response_json, resources.EventTimeline, elapsed_time, lightweight
         )
 
     def get_scores(
@@ -97,7 +97,7 @@ def get_scores(
             params=params, session=session, url=url
         )
         return self.process_response(
-            response, response_json, resources.Scores, elapsed_time, lightweight
+            response_json, resources.Scores, elapsed_time, lightweight
         )
 
     def request(

diff --git a/betfairlightweight/endpoints/keepalive.py b/betfairlightweight/endpoints/keepalive.py
@@ -30,7 +30,7 @@ def __call__(
         (response, response_json, elapsed_time) = self.request(session=session)
         self.client.set_session_token(response_json.get("token"))
         return self.process_response(
-            response, response_json, KeepAliveResource, elapsed_time, lightweight
+            response_json, KeepAliveResource, elapsed_time, lightweight
         )
 
     def request(

diff --git a/betfairlightweight/endpoints/login.py b/betfairlightweight/endpoints/login.py
@@ -32,7 +32,7 @@ def __call__(
         )
         self.client.set_session_token(response_json.get("sessionToken"))
         return self.process_response(
-            response, response_json, LoginResource, elapsed_time, lightweight
+            response_json, LoginResource, elapsed_time, lightweight
         )
 
     def request(

diff --git a/betfairlightweight/endpoints/logininteractive.py b/betfairlightweight/endpoints/logininteractive.py
@@ -32,7 +32,7 @@ def __call__(
         )
         self.client.set_session_token(response_json.get("token"))
         return self.process_response(
-            response, response_json, LoginResource, elapsed_time, lightweight
+            response_json, LoginResource, elapsed_time, lightweight
         )
 
     def request(

diff --git a/betfairlightweight/endpoints/logout.py b/betfairlightweight/endpoints/logout.py
@@ -30,7 +30,7 @@ def __call__(
         (response, response_json, elapsed_time) = self.request(session=session)
         self.client.client_logout()
         return self.process_response(
-            response, response_json, LogoutResource, elapsed_time, lightweight
+            response_json, LogoutResource, elapsed_time, lightweight
         )
 
     def request(

diff --git a/betfairlightweight/endpoints/racecard.py b/betfairlightweight/endpoints/racecard.py
@@ -65,7 +65,7 @@ def get_race_card(
             "raceCard", params=params, session=session
         )
         return self.process_response(
-            response, response_json, resources.RaceCard, elapsed_time, lightweight
+            response_json, resources.RaceCard, elapsed_time, lightweight
         )
 
     def get_race_result(
@@ -94,9 +94,7 @@ def get_race_result(
         (response, response_json, elapsed_time) = self.request(
             "raceResults", params=params, session=session
         )
-        return self.process_response(
-            response, response_json, None, elapsed_time, lightweight
-        )
+        return self.process_response(response_json, None, elapsed_time, lightweight)
 
     def request(
         self, method: str = None, params: dict = None, session: requests.Session = None

diff --git a/betfairlightweight/endpoints/scores.py b/betfairlightweight/endpoints/scores.py
@@ -37,7 +37,7 @@ def list_race_details(
         method = "%s%s" % (self.URI, "listRaceDetails")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response, response_json, resources.RaceDetails, elapsed_time, lightweight
+            response_json, resources.RaceDetails, elapsed_time, lightweight
         )
 
     # Following requires app key to be authorised
@@ -65,7 +65,7 @@ def list_available_events(
         method = "%s%s" % (self.URI, "listAvailableEvents")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response, response_json, resources.AvailableEvent, elapsed_time, lightweight
+            response_json, resources.AvailableEvent, elapsed_time, lightweight
         )
 
     def list_scores(
@@ -88,7 +88,7 @@ def list_scores(
         method = "%s%s" % (self.URI, "listScores")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response, response_json, resources.Score, elapsed_time, lightweight
+            response_json, resources.Score, elapsed_time, lightweight
         )
 
     def list_incidents(
@@ -111,7 +111,7 @@ def list_incidents(
         method = "%s%s" % (self.URI, "listIncidents")
         (response, response_json, elapsed_time) = self.request(method, params, session)
         return self.process_response(
-            response, response_json, resources.Incidents, elapsed_time, lightweight
+            response_json, resources.Incidents, elapsed_time, lightweight
         )
 
     @property

diff --git a/betfairlightweight/resources/baseresource.py b/betfairlightweight/resources/baseresource.py
@@ -11,7 +11,6 @@ class BaseResource:
 
     def __init__(self, **kwargs):
         self.elapsed_time = kwargs.pop("elapsed_time", None)
-        self._response = kwargs.pop("_response", None)  # requests.Response
         now = datetime.datetime.utcnow()
         self._datetime_created = now
         self._datetime_updated = now