Converted all string formating to f-strings

Converted all super calls to py3 style

betfairlightweight/apiclient.py

@@ -31,7 +31,7 @@ def __init__(
         :param bool lightweight: If True endpoints will return dict not a resource (22x faster)
         :param requests.Session session: Pass requests session object, defaults to a new request each request
         """
-        super(APIClient, self).__init__(
+        super().__init__(
             username,
             password,
             app_key=app_key,

betfairlightweight/baseclient.py

@@ -175,7 +175,7 @@ def cert(self) -> Union[Tuple[str], str]:
             return (cert, key)
         if pem:
             return pem
-        msg = "Certificates not found in directory: '%s'" % ssl_path
+        msg = f"Certificates not found in directory: '{ssl_path}'"
         hint = " (make sure .crt and .key pair or a single .pem is present)"
         raise CertsError(msg + hint)
 

betfairlightweight/exceptions.py

@@ -15,7 +15,7 @@ class PasswordError(BetfairError):
     """
 
     def __init__(self, username: str):
-        super(PasswordError, self).__init__(username)
+        super().__init__(username)
         self.username = username
 
     def __str__(self):
@@ -28,7 +28,7 @@ class AppKeyError(BetfairError):
     """
 
     def __init__(self, username: str):
-        super(AppKeyError, self).__init__(username)
+        super().__init__(username)
         self.username = username
 
     def __str__(self):
@@ -41,7 +41,7 @@ class CertsError(BetfairError):
     """
 
     def __init__(self, message: str = None):
-        super(CertsError, self).__init__(message)
+        super().__init__(message)
         self.message = message
 
     def __str__(self):
@@ -54,7 +54,7 @@ class StatusCodeError(BetfairError):
     """
 
     def __init__(self, status_code: str):
-        super(StatusCodeError, self).__init__(status_code)
+        super().__init__(status_code)
         self.status_code = status_code
 
     def __str__(self):
@@ -68,7 +68,7 @@ class InvalidResponse(BetfairError):
     """
 
     def __init__(self, response: Union[dict, list]):
-        super(InvalidResponse, self).__init__(response)
+        super().__init__(response)
         self.response = response
 
     def __str__(self):
@@ -81,7 +81,7 @@ class LoginError(BetfairError):
     """
 
     def __init__(self, response: dict):
-        super(LoginError, self).__init__(response)
+        super().__init__(response)
         self.response = response
 
     def __str__(self):
@@ -97,7 +97,7 @@ class KeepAliveError(BetfairError):
     """
 
     def __init__(self, response: dict):
-        super(KeepAliveError, self).__init__(response)
+        super().__init__(response)
         self.response = response
 
     def __str__(self):
@@ -118,26 +118,21 @@ def __init__(
         params: dict = None,
         exception: Exception = None,
     ):
-        super(APIError, self).__init__(response, method, params, exception)
+        super().__init__(response, method, params, exception)
         self.response = response
         self.method = method
         self.params = params
         self.exception = exception
 
     def __str__(self):
         if not self.response:
-            return "%s \nParams: %s \nException: %s" % (
-                self.method,
-                self.params,
-                self.exception,
+            return (
+                f"{self.method} \nParams: {self.params} \nException: {self.exception}"
             )
         error_data = self.response.get("error")
-        return "%s \nParams: %s \nException: %s \nError: %s \nFull Response: %s" % (
-            self.method,
-            self.params,
-            self.exception,
-            error_data,
-            self.response,
+        return (
+            f"{self.method} \nParams: {self.params} \nException: {self.exception} \n"
+            f"Error: {error_data} \nFull Response: {self.response}"
         )
 
 
@@ -147,7 +142,7 @@ class LogoutError(BetfairError):
     """
 
     def __init__(self, response: dict):
-        super(LogoutError, self).__init__(response)
+        super().__init__(response)
         self.response = response
 
     def __str__(self):
@@ -162,7 +157,7 @@ class SocketError(BetfairError):
     """
 
     def __init__(self, message: str):
-        super(SocketError, self).__init__(message)
+        super().__init__(message)
         self.message = message
 
     def __str__(self):
@@ -175,7 +170,7 @@ class ListenerError(BetfairError):
     """
 
     def __init__(self, connection_id: str, data: str):
-        super(ListenerError, self).__init__(connection_id, data)
+        super().__init__(connection_id, data)
         self.connection_id = connection_id
         self.data = data
 
@@ -189,7 +184,7 @@ class CacheError(BetfairError):
     """
 
     def __init__(self, message: str):
-        super(CacheError, self).__init__(message)
+        super().__init__(message)
         self.message = message
 
     def __str__(self):
@@ -202,7 +197,7 @@ class RaceCardError(BetfairError):
     """
 
     def __init__(self, message: str):
-        super(RaceCardError, self).__init__(message)
+        super().__init__(message)
         self.message = message
 
     def __str__(self):

betfairlightweight/resources/accountresources.py

@@ -3,7 +3,7 @@
 
 class AccountFunds(BaseResource):
     def __init__(self, **kwargs):
-        super(AccountFunds, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.available_to_bet_balance = kwargs.get("availableToBetBalance")
         self.discount_rate = kwargs.get("discountRate")
         self.exposure = kwargs.get("exposure")
@@ -15,7 +15,7 @@ def __init__(self, **kwargs):
 
 class AccountDetails(BaseResource):
     def __init__(self, **kwargs):
-        super(AccountDetails, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.country_code = kwargs.get("countryCode")
         self.currency_code = kwargs.get("currencyCode")
         self.discount_rate = kwargs.get("discountRate")
@@ -90,7 +90,7 @@ def __init__(
 
 class AccountStatementResult(BaseResource):
     def __init__(self, **kwargs):
-        super(AccountStatementResult, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.more_available = kwargs.get("moreAvailable")
         self.account_statement = [
             AccountStatement(**i) for i in kwargs.get("accountStatement")
@@ -99,12 +99,12 @@ def __init__(self, **kwargs):
 
 class CurrencyRate(BaseResource):
     def __init__(self, **kwargs):
-        super(CurrencyRate, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.currency_code = kwargs.get("currencyCode")
         self.rate = kwargs.get("rate")
 
 
 class TransferFunds(BaseResource):
     def __init__(self, **kwargs):
-        super(TransferFunds, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.transaction_id = kwargs.get("transactionId")

betfairlightweight/resources/authresources.py

@@ -3,14 +3,14 @@
 
 class LoginResource(BaseResource):
     def __init__(self, **kwargs):
-        super(LoginResource, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.session_token = kwargs.get("sessionToken")
         self.login_status = kwargs.get("loginStatus")
 
 
 class KeepAliveResource(BaseResource):
     def __init__(self, **kwargs):
-        super(KeepAliveResource, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.product = kwargs.get("product")
         self.status = kwargs.get("status")
         self.token = kwargs.get("token")
@@ -19,7 +19,7 @@ def __init__(self, **kwargs):
 
 class LogoutResource(BaseResource):
     def __init__(self, **kwargs):
-        super(LogoutResource, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.product = kwargs.get("product")
         self.status = kwargs.get("status")
         self.token = kwargs.get("token")

betfairlightweight/resources/bettingresources.py

@@ -36,7 +36,7 @@ class EventTypeResult(BaseResource, BettingResource):
     """
 
     def __init__(self, **kwargs):
-        super(EventTypeResult, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.market_count = kwargs.get("marketCount")
         self.event_type = EventType(**kwargs.get("eventType"))
 
@@ -60,7 +60,7 @@ class CompetitionResult(BaseResource, BettingResource):
     """
 
     def __init__(self, **kwargs):
-        super(CompetitionResult, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.market_count = kwargs.get("marketCount")
         self.competition_region = kwargs.get("competitionRegion")
         self.competition = Competition(**kwargs.get("competition"))
@@ -86,7 +86,7 @@ class TimeRangeResult(BaseResource, BettingResource):
     """
 
     def __init__(self, **kwargs):
-        super(TimeRangeResult, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.market_count = kwargs.get("marketCount")
         self.time_range = TimeRange(**kwargs.get("timeRange"))
 
@@ -127,7 +127,7 @@ class EventResult(BaseResource, BettingResource):
     """
 
     def __init__(self, **kwargs):
-        super(EventResult, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.market_count = kwargs.get("marketCount")
         self.event = Event(**kwargs.get("event"))
 
@@ -139,7 +139,7 @@ class MarketTypeResult(BaseResource, BettingResource):
     """
 
     def __init__(self, **kwargs):
-        super(MarketTypeResult, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.market_count = kwargs.get("marketCount")
         self.market_type = kwargs.get("marketType")
 
@@ -151,7 +151,7 @@ class CountryResult(BaseResource, BettingResource):
     """
 
     def __init__(self, **kwargs):
-        super(CountryResult, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.market_count = kwargs.get("marketCount")
         self.country_code = kwargs.get("countryCode")
 
@@ -163,7 +163,7 @@ class VenueResult(BaseResource, BettingResource):
     """
 
     def __init__(self, **kwargs):
-        super(VenueResult, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.market_count = kwargs.get("marketCount")
         self.venue = kwargs.get("venue")
 
@@ -299,7 +299,7 @@ class MarketCatalogue(BaseResource, BettingResource):
     """
 
     def __init__(self, **kwargs):
-        super(MarketCatalogue, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.market_id = kwargs.get("marketId")
         self.market_name = kwargs.get("marketName")
         self.total_matched = kwargs.get("totalMatched")
@@ -587,7 +587,7 @@ def __init__(self, **kwargs):
         self.streaming_update = kwargs.pop("streaming_update", None)
         self.streaming_snap = kwargs.pop("streaming_snap", False)
         self.market_definition = kwargs.pop("market_definition", None)
-        super(MarketBook, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.market_id = kwargs.get("marketId")
         self.bet_delay = kwargs.get("betDelay")
         self.bsp_reconciled = kwargs.get("bspReconciled")
@@ -732,7 +732,7 @@ def __init__(self, **kwargs):
         self.streaming_update = kwargs.pop("streaming_update", None)
         self.streaming_snap = kwargs.pop("streaming_snap", False)
         self.publish_time = kwargs.pop("publish_time", None)
-        super(CurrentOrders, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.more_available = kwargs.get("moreAvailable")
         self.orders = [CurrentOrder(**i) for i in kwargs.get("currentOrders")]
         self.matches = [Match(**i) for i in kwargs.get("matches", [])]
@@ -841,7 +841,7 @@ class ClearedOrders(BaseResource, BettingResource):
     _item_name_to_attribute_name_overrides = {"clearedOrders": "orders"}
 
     def __init__(self, **kwargs):
-        super(ClearedOrders, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.more_available = kwargs.get("moreAvailable")
         self.orders = [ClearedOrder(**i) for i in kwargs.get("clearedOrders")]
 
@@ -875,7 +875,7 @@ class MarketProfitLoss(BaseResource, BettingResource):
     """
 
     def __init__(self, **kwargs):
-        super(MarketProfitLoss, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.market_id = kwargs.get("marketId")
         self.commission_applied = kwargs.get("commissionApplied")
         self.profit_and_losses = [
@@ -1015,7 +1015,7 @@ class PlaceOrders(BaseResource, BettingResource):
     }
 
     def __init__(self, **kwargs):
-        super(PlaceOrders, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.market_id = kwargs.get("marketId")
         self.status = kwargs.get("status")
         self.customer_ref = kwargs.get("customerRef")
@@ -1074,7 +1074,7 @@ class CancelOrders(BaseResource, BettingResource):
     }
 
     def __init__(self, **kwargs):
-        super(CancelOrders, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.market_id = kwargs.get("marketId")
         self.status = kwargs.get("status")
         self.customer_ref = kwargs.get("customerRef")
@@ -1122,7 +1122,7 @@ class UpdateOrders(BaseResource, BettingResource):
     }
 
     def __init__(self, **kwargs):
-        super(UpdateOrders, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.market_id = kwargs.get("marketId")
         self.status = kwargs.get("status")
         self.customer_ref = kwargs.get("customerRef")
@@ -1167,7 +1167,7 @@ class ReplaceOrders(BaseResource, BettingResource):
     """
 
     def __init__(self, **kwargs):
-        super(ReplaceOrders, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.market_id = kwargs.get("marketId")
         self.status = kwargs.get("status")
         self.customer_ref = kwargs.get("customerRef")

betfairlightweight/resources/inplayserviceresources.py

@@ -116,7 +116,7 @@ def __init__(
 
 class EventTimeline(BaseResource):
     def __init__(self, **kwargs):
-        super(EventTimeline, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.event_id = kwargs.get("eventId")
         self.elapsed_regular_time = kwargs.get("elapsedRegularTime")
         self.event_type_id = kwargs.get("eventTypeId")
@@ -174,7 +174,7 @@ def __init__(
 
 class Scores(BaseResource):
     def __init__(self, **kwargs):
-        super(Scores, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.event_id = kwargs.get("eventId")
         self.elapsed_regular_time = kwargs.get("elapsedRegularTime")
         self.elapsed_added_time = kwargs.get("elapsedAddedTime")