Refactor URL construction and error messages in currency and SGS modules for improved readability

Author: wilsonfreitas

bcb/currency.py

@@ -19,12 +19,11 @@
 def _currency_url(currency_id: str, start_date: DateInput, end_date: DateInput) -> str:
     start_date = Date(start_date)
     end_date = Date(end_date)
-    url = (
-        "https://ptax.bcb.gov.br/ptax_internet/consultaBoletim.do?"
-        "method=gerarCSVFechamentoMoedaNoPeriodo&"
-        "ChkMoeda={}&DATAINI={:%d/%m/%Y}&DATAFIM={:%d/%m/%Y}"
+    return (
+        f"https://ptax.bcb.gov.br/ptax_internet/consultaBoletim.do?"
+        f"method=gerarCSVFechamentoMoedaNoPeriodo&"
+        f"ChkMoeda={currency_id}&DATAINI={start_date.date:%d/%m/%Y}&DATAFIM={end_date.date:%d/%m/%Y}"
     )
-    return url.format(currency_id, start_date.date, end_date.date)
 
 
 CACHE = dict()
@@ -115,7 +114,7 @@ def _get_symbol(symbol: str, start_date: DateInput, end_date: DateInput) -> pd.D
         x = elm.text
         x = re.sub(r"^\W+", "", x)
         x = re.sub(r"\W+$", "", x)
-        msg = "BCB API returned error: {} - {}".format(x, symbol)
+        msg = f"BCB API returned error: {x} - {symbol}"
         warnings.warn(msg)
         return None
 

bcb/sgs/__init__.py

@@ -61,9 +61,9 @@ def _get_url_and_payload(code: int, start_date: DateInput, end_date: DateInput,
             payload["dataInicial"] = Date(start_date).date.strftime("%d/%m/%Y")
             end_date = end_date if end_date else "today"
             payload["dataFinal"] = Date(end_date).date.strftime("%d/%m/%Y")
-        url = "https://api.bcb.gov.br/dados/serie/bcdata.sgs.{}/dados".format(code)
+        url = f"https://api.bcb.gov.br/dados/serie/bcdata.sgs.{code}/dados"
     else:
-        url = ("https://api.bcb.gov.br/dados/serie/bcdata.sgs.{}/dados" "/ultimos/{}").format(code, last)
+        url = f"https://api.bcb.gov.br/dados/serie/bcdata.sgs.{code}/dados/ultimos/{last}"
 
     return {"payload": payload, "url": url}
 
@@ -181,8 +181,8 @@ def get_json(code: int, start: Optional[DateInput] = None, end: Optional[DateInp
         except Exception:
             res_json = {}
         if "error" in res_json:
-            raise Exception("BCB error: {}".format(res_json["error"]))
+            raise Exception(f"BCB error: {res_json['error']}")
         elif "erro" in res_json:
-            raise Exception("BCB error: {}".format(res_json["erro"]["detail"]))
-        raise Exception("Download error: code = {}".format(code))
+            raise Exception(f"BCB error: {res_json['erro']['detail']}")
+        raise Exception(f"Download error: code = {code}")
     return res.text