Replace .format() w/ f-strings

Author: jhodges10

examples/assets/asset_scraper.py

@@ -51,9 +51,9 @@ def get_projects_from_team(
         # Add project_name and team_name to the dict
         proj["project_name"] = proj.get("name")
         proj["team_name"] = team_name
-        print("Debug: Found project: {}".format(proj["project_name"]))
+        print(f"Debug: Found project: {proj['project_name']}")
         projects_in_team.append(proj)
-        print("Debug: projects in team now: {}".format(len(projects_in_team)))
+        print(f"Debug: projects in team now: {len(projects_in_team)}")
 
     return projects_in_team
 
@@ -64,10 +64,10 @@ def get_projects_from_account(client) -> List[Dict]:
     teams = get_teams_from_account(client)
 
     for team_id, team_name in teams.items():
-        print("Debug: === Found team: {} ===".format(team_name))
+        print(f"Debug: === Found team: {team_name} ===")
         projects_in_team = get_projects_from_team(client, team_id, team_name)
         projects_in_account.extend(projects_in_team)
-        print("Debug: projects in account now: {}".format(len(projects_in_account)))
+        print(f"Debug: projects in account now: {len(projects_in_account)}")
 
     return projects_in_account
 
@@ -81,7 +81,7 @@ def scrape_asset_data_from_projects(
     """
     assets_in_projects = []
     for project in projects:
-        print("Debug: Scanning project: {} for assets".format(project["name"]))
+        print(f"Debug: Scanning project: {project['name']} for assets")
         assets_in_project = []
         proj_root_asset_id = project.get("root_asset_id")
         assets_in_project = scrape_asset_data(
@@ -182,7 +182,7 @@ def write_assets_to_csv(asset_list: List[Dict], filename: str) -> None:
     for a in asset_list:
         flat_assets_list.append(flatten_dict(a))
 
-    with open("asset_record_for_account_id-{}".format(filename), "w") as f:
+    with open(f"asset_record_for_account_id-{filename}", "w") as f:
         f_csv = csv.DictWriter(f, headers, extrasaction="ignore")
         f_csv.writeheader()
         f_csv.writerows(flat_assets_list)

frameioclient/lib/download.py

@@ -72,7 +72,7 @@ def get_path(self):
     def _evaluate_asset(self):
         if self.asset.get("_type") != "file":
             raise DownloadException(
-                message="Unsupport Asset type: {}".format(self.asset.get("_type"))
+                message=f"Unsupport Asset type: {self.asset.get('_type')}"
             )
 
         # This logic may block uploads that were started before this field was introduced
@@ -98,7 +98,7 @@ def _create_file_stub(self):
         return True
 
     def _get_path(self):
-        logger.info("prefix: {}".format(self.prefix))
+        logger.info(f"prefix: {self.prefix}")
         if self.prefix != None:
             self.filename = self.prefix + self.filename
 

frameioclient/lib/telemetry.py

@@ -31,7 +31,7 @@ def build_context(self):
 
     def push(self, event_name, properties):
         self.logger.info(
-            ("Pushing '{}' event to segment".format(event_name), properties)
+            (f"Pushing '{event_name}' event to segment", properties)
         )
 
         try:

frameioclient/lib/transfer.py

@@ -8,16 +8,22 @@
 
 import requests
 
-from .exceptions import (AssetChecksumMismatch, AssetChecksumNotPresent,
-                         DownloadException)
+from .exceptions import (
+    AssetChecksumMismatch,
+    AssetChecksumNotPresent,
+    DownloadException,
+)
 from .logger import SDKLogger
 from .utils import FormatTypes, Utils
 
 logger = SDKLogger("downloads")
 
 from .bandwidth import DiskBandwidth, NetworkBandwidth
-from .exceptions import (AssetNotFullyUploaded, DownloadException,
-                         WatermarkIDDownloadException)
+from .exceptions import (
+    AssetNotFullyUploaded,
+    DownloadException,
+    WatermarkIDDownloadException,
+)
 from .transport import HTTPClient
 
 
@@ -71,7 +77,7 @@ def get_path(self):
     def _evaluate_asset(self):
         if self.asset.get("_type") != "file":
             raise DownloadException(
-                message="Unsupport Asset type: {}".format(self.asset.get("_type"))
+                message=f"Unsupport Asset type: {self.asset.get('_type')}"
             )
 
         # This logic may block uploads that were started before this field was introduced
@@ -196,7 +202,7 @@ def __init__(self, downloader: FrameioDownloader, concurrency=None, progress=Tru
         self.bytes_completed = 0
         self.downloader = downloader
         self.futures = []
-        self.original = self.downloader.asset['original']
+        self.original = self.downloader.asset["original"]
 
         # Ensure this is a valid number before assigning
         if concurrency is not None and type(concurrency) == int and concurrency > 0:
@@ -299,10 +305,7 @@ def _download_whole(self, url: str):
             math.ceil(self.downloader.filesize / (download_time))
         )
         print(
-            "Downloaded {} at {}".format(
-                Utils.format_value(self.downloader.filesize, type=FormatTypes.SIZE),
-                download_speed,
-            )
+            f"Downloaded {Utils.format_value(self.downloader.filesize, type=FormatTypes.SIZE)} at {download_speed}"
         )
 
         return self.destination, download_speed
@@ -378,10 +381,7 @@ def multi_thread_download(self):
         in_byte = 0  # Set initially here, but then override
 
         print(
-            "Multi-part download -- {} -- {}".format(
-                self.downloader.asset["name"],
-                Utils.format_value(self.downloader.filesize, type=FormatTypes.SIZE),
-            )
+            f"Multi-part download -- {self.downloader.asset['name']} -- {Utils.format_value(self.downloader.filesize, type=FormatTypes.SIZE)}"
         )
 
         with concurrent.futures.ThreadPoolExecutor(
@@ -392,7 +392,7 @@ def multi_thread_download(self):
                 out_byte = offset * (i + 1)
 
                 # Create task tuple
-                task = (self.downloader.asset['original'], in_byte, out_byte, i)
+                task = (self.downloader.asset["original"], in_byte, out_byte, i)
 
                 # Stagger start for each chunk by 0.1 seconds
                 if i < self.concurrency:
@@ -423,22 +423,22 @@ def multi_thread_download(self):
                 raise AssetChecksumNotPresent
 
             # Calculate the file hash
-            if Utils.calculate_hash(self.destination) != self.downloader.original_checksum:
+            if (
+                Utils.calculate_hash(self.destination)
+                != self.downloader.original_checksum
+            ):
                 raise AssetChecksumMismatch
 
         # Log completion event
         SDKLogger("downloads").info(
-            "Downloaded {} at {}".format(
-                Utils.format_value(self.downloader.filesize, type=FormatTypes.SIZE),
-                download_speed,
-            )
+            f"Downloaded {Utils.format_value(self.downloader.filesize, type=FormatTypes.SIZE)} at {download_speed}"
         )
 
         # Submit telemetry
         transfer_stats = {
             "speed": download_speed,
             "time": download_time,
-            "cdn": AWSClient.check_cdn(self.original)
+            "cdn": AWSClient.check_cdn(self.original),
         }
 
         # Event(self.user_id, 'python-sdk-download-stats', transfer_stats)

frameioclient/lib/transport.py

@@ -15,12 +15,13 @@
 
 
 class HTTPMethods:
-    GET = 'get'
-    POST = 'post'
-    PUT = 'put'
-    DELETE = 'delete'
-    PATCH = 'patch'
-    HEAD = 'head'
+    GET = "get"
+    POST = "post"
+    PUT = "put"
+    DELETE = "delete"
+    PATCH = "patch"
+    HEAD = "head"
+
 
 class HTTPClient(object):
     """HTTP Client base that automatically handles the following:
@@ -41,9 +42,7 @@ def __init__(self, threads: Optional[int] = default_thread_count):
         # Initialize empty thread object
         self.thread_local = None
         self.client_version = ClientVersion.version()
-        self.shared_headers = {
-            "x-frameio-client": "python/{}".format(self.client_version)
-        }
+        self.shared_headers = {"x-frameio-client": f"python/{self.client_version}"}
 
         # Configure retry strategy (very broad right now)
         self.retry_strategy = Retry(
@@ -91,12 +90,14 @@ def __init__(self, token: str, host: str, threads: int, progress: bool):
         self.progress = progress
         self._initialize_thread()
         self.session = self._get_session()
-        self.auth_header = {"Authorization": "Bearer {}".format(self.token)}
+        self.auth_header = {"Authorization": f"Bearer {self.token}"}
 
     def _format_api_call(self, endpoint: str):
-        return "{}/v2{}".format(self.host, endpoint)
+        return f"{self.host}/v2{endpoint}"
 
-    def _api_call(self, method, endpoint: str, payload: Dict = {}, limit: Optional[int] = None):
+    def _api_call(
+        self, method, endpoint: str, payload: Dict = {}, limit: Optional[int] = None
+    ):
         headers = {**self.shared_headers, **self.auth_header}
 
         r = self.session.request(
@@ -128,7 +129,9 @@ def _api_call(self, method, endpoint: str, payload: Dict = {}, limit: Optional[i
 
         return r.raise_for_status()
 
-    def get_specific_page(self, method: HTTPMethods, endpoint: str, payload: Dict, page: int):
+    def get_specific_page(
+        self, method: HTTPMethods, endpoint: str, payload: Dict, page: int
+    ):
         """
         Gets a specific page for that endpoint, used by Pagination Class
 
@@ -139,7 +142,7 @@ def get_specific_page(self, method: HTTPMethods, endpoint: str, payload: Dict, p
             page (int): What page to get
         """
         if method == HTTPMethods.GET:
-            endpoint = "{}?page={}".format(endpoint, page)
+            endpoint = "{endpoint}?page={page}"
             return self._api_call(method, endpoint)
 
         if method == HTTPMethods.POST:

frameioclient/lib/utils.py

@@ -169,8 +169,8 @@ def format_headers(token: str, version: str) -> Dict:
         :param version: The version of the frameioclient sdk to add to our HTTP header
         """
         return {
-            "Authorization": "Bearer {}".format(token),
-            "x-frameio-client": "python/{}".format(version),
+            "Authorization": f"Bearer {token}",
+            "x-frameio-client": f"python/{version}",
         }
 
 

setup.py

@@ -17,9 +17,7 @@ def run(self):
         tag = os.getenv('CIRCLE_TAG')
 
         if tag != version:
-            info = "Git tag: {0} does not match the version of this app: {1}".format(
-                tag, version
-            )
+            info = f"Git tag: {tag} does not match the version of this app: {version}"
             sys.exit(info)
 
 setuptools.setup(