Merge pull request #6 from roaldnefs/use-f-strings

Use fancier output formatting

Author: roaldnefs

transip/__init__.py

@@ -49,31 +49,20 @@ def __init__(
     ) -> None:
 
         self._api_version: str = api_version
-        self._url: str = "https://api.transip.nl/v{version}".format(
-            version=api_version
-        )
+        self._url: str = f"https://api.transip.nl/v{api_version}"
         self._access_token: Optional[str] = access_token
 
         # Headers to use when making a request to TransIP
         self.headers: Dict[str, str] = {
-            "User-Agent": "{title}/{version}".format(
-                title=__title__,
-                version=__version__
-            ),
-            "Authorization": "Bearer {token}".format(
-                token=access_token
-            )
+            "User-Agent": f"{__title__}/{__version__}",
+            "Authorization": f"Bearer {access_token}"
         }
 
         # Initialize a session object for making requests
         self.session: requests.Session = requests.Session()
 
         # Dynamically import the services for the specified API version
-        services = importlib.import_module(
-            "transip.v{version}.services".format(
-                version=api_version
-            )
-        )
+        services = importlib.import_module(f"transip.v{api_version}.services")
 
         self.availability_zones: Type[Any] = (
             services.AvailabilityZoneService(self)  # type: ignore
@@ -96,10 +85,7 @@ def _get_headers(
         return headers
 
     def _build_url(self, path: str) -> str:
-        return "{api_url}{path}".format(
-            api_url=self._url,
-            path=path
-        )
+        return f"{self._url}{path}"
 
     def _send(
         self,

transip/base.py

@@ -40,18 +40,14 @@ def __setattr__(self, name: str, value: Any) -> None:
         self.__dict__["_attrs"][name] = value
 
     def __str__(self) -> str:
-        return "{} => {}".format(type(self), self._attrs)
+        return f"{type(self)} => {self._attrs}"
 
     def __repr__(self) -> str:
         name = self.__class__.__name__
         if self._id_attr:
-            return "<{name} {id}:{value}>".format(
-                name=name,
-                id=self._id_attr,
-                value=self.get_id()
-            )
+            return f"<{name} {self._id_attr}:{self.get_id()}>"
         else:
-            return "<{name}>".format(name=name)
+            return f"<{name}>"
 
     def __dir__(self):
         return super().__dir__() + list(self.attrs)

transip/exceptions.py

@@ -43,10 +43,7 @@ def __init__(
 
     def __str__(self) -> str:
         if self.response_code:
-            return "{code}: {message}".format(
-                code=self.response_code,
-                message=self.message
-            )
+            return f"{self.response_code}: {self.message}"
         else:
             return self.message
 

transip/mixins.py

@@ -38,12 +38,8 @@ class GetMixin:
 
     def get(self, id: str, **kwargs) -> Optional[Type[ApiObject]]:
         if self._obj_cls or self._path or self._resp_get_attr:
-            path: str = "{path}/{id}".format(
-                path=self._path,
-                id=id
-            )
             obj: Type[ApiObject] = self._obj_cls(  # type: ignore
-                self.client.get(path)[self._resp_get_attr]
+                self.client.get(f"{self._path}/{id}")[self._resp_get_attr]
             )
             return obj
         return None