Skip to content

Commit bc8316f

Browse files
jooolajooola
authored
refactor: use f-string (#267)
1 parent ee79851 commit bc8316f

11 files changed

Lines changed: 54 additions & 162 deletions

File tree

‎hcloud/certificates/client.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -313,9 +313,7 @@ def get_actions_list(
313313
params["per_page"] = per_page
314314

315315
response = self._client.request(
316-
url="/certificates/{certificate_id}/actions".format(
317-
certificate_id=certificate.id
318-
),
316+
url=f"/certificates/{certificate.id}/actions",
319317
method="GET",
320318
params=params,
321319
)
@@ -352,9 +350,7 @@ def retry_issuance(
352350
:return: :class:`BoundAction <hcloud.actions.client.BoundAction>`
353351
"""
354352
response = self._client.request(
355-
url="/certificates/{certificate_id}/actions/retry".format(
356-
certificate_id=certificate.id
357-
),
353+
url=f"/certificates/{certificate.id}/actions/retry",
358354
method="POST",
359355
)
360356
return BoundAction(self._client.actions, response["action"])

‎hcloud/firewalls/client.py‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -397,9 +397,7 @@ def set_rules(
397397
for rule in rules:
398398
data["rules"].append(rule.to_payload())
399399
response = self._client.request(
400-
url="/firewalls/{firewall_id}/actions/set_rules".format(
401-
firewall_id=firewall.id
402-
),
400+
url=f"/firewalls/{firewall.id}/actions/set_rules",
403401
method="POST",
404402
json=data,
405403
)
@@ -420,9 +418,7 @@ def apply_to_resources(
420418
for resource in resources:
421419
data["apply_to"].append(resource.to_payload())
422420
response = self._client.request(
423-
url="/firewalls/{firewall_id}/actions/apply_to_resources".format(
424-
firewall_id=firewall.id
425-
),
421+
url=f"/firewalls/{firewall.id}/actions/apply_to_resources",
426422
method="POST",
427423
json=data,
428424
)
@@ -443,9 +439,7 @@ def remove_from_resources(
443439
for resource in resources:
444440
data["remove_from"].append(resource.to_payload())
445441
response = self._client.request(
446-
url="/firewalls/{firewall_id}/actions/remove_from_resources".format(
447-
firewall_id=firewall.id
448-
),
442+
url=f"/firewalls/{firewall.id}/actions/remove_from_resources",
449443
method="POST",
450444
json=data,
451445
)

‎hcloud/floating_ips/client.py‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,7 @@ def get_actions_list(
173173
if per_page is not None:
174174
params["per_page"] = per_page
175175
response = self._client.request(
176-
url="/floating_ips/{floating_ip_id}/actions".format(
177-
floating_ip_id=floating_ip.id
178-
),
176+
url=f"/floating_ips/{floating_ip.id}/actions",
179177
method="GET",
180178
params=params,
181179
)
@@ -386,9 +384,7 @@ def change_protection(
386384
data.update({"delete": delete})
387385

388386
response = self._client.request(
389-
url="/floating_ips/{floating_ip_id}/actions/change_protection".format(
390-
floating_ip_id=floating_ip.id
391-
),
387+
url=f"/floating_ips/{floating_ip.id}/actions/change_protection",
392388
method="POST",
393389
json=data,
394390
)
@@ -407,9 +403,7 @@ def assign(
407403
:return: :class:`BoundAction <hcloud.actions.client.BoundAction>`
408404
"""
409405
response = self._client.request(
410-
url="/floating_ips/{floating_ip_id}/actions/assign".format(
411-
floating_ip_id=floating_ip.id
412-
),
406+
url=f"/floating_ips/{floating_ip.id}/actions/assign",
413407
method="POST",
414408
json={"server": server.id},
415409
)
@@ -422,9 +416,7 @@ def unassign(self, floating_ip: FloatingIP | BoundFloatingIP) -> BoundAction:
422416
:return: :class:`BoundAction <hcloud.actions.client.BoundAction>`
423417
"""
424418
response = self._client.request(
425-
url="/floating_ips/{floating_ip_id}/actions/unassign".format(
426-
floating_ip_id=floating_ip.id
427-
),
419+
url=f"/floating_ips/{floating_ip.id}/actions/unassign",
428420
method="POST",
429421
)
430422
return BoundAction(self._client.actions, response["action"])
@@ -445,9 +437,7 @@ def change_dns_ptr(
445437
:return: :class:`BoundAction <hcloud.actions.client.BoundAction>`
446438
"""
447439
response = self._client.request(
448-
url="/floating_ips/{floating_ip_id}/actions/change_dns_ptr".format(
449-
floating_ip_id=floating_ip.id
450-
),
440+
url=f"/floating_ips/{floating_ip.id}/actions/change_dns_ptr",
451441
method="POST",
452442
json={"ip": ip, "dns_ptr": dns_ptr},
453443
)

‎hcloud/images/client.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,9 +371,7 @@ def change_protection(
371371
data.update({"delete": delete})
372372

373373
response = self._client.request(
374-
url="/images/{image_id}/actions/change_protection".format(
375-
image_id=image.id
376-
),
374+
url=f"/images/{image.id}/actions/change_protection",
377375
method="POST",
378376
json=data,
379377
)

‎hcloud/load_balancer_types/client.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ def get_by_id(self, id: int) -> BoundLoadBalancerType:
3030
:return: :class:`BoundLoadBalancerType <hcloud.load_balancer_type.client.BoundLoadBalancerType>`
3131
"""
3232
response = self._client.request(
33-
url="/load_balancer_types/{load_balancer_type_id}".format(
34-
load_balancer_type_id=id
35-
),
33+
url=f"/load_balancer_types/{id}",
3634
method="GET",
3735
)
3836
return BoundLoadBalancerType(self, response["load_balancer_type"])

‎hcloud/load_balancers/client.py‎

Lines changed: 16 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -513,9 +513,7 @@ def update(
513513
if labels is not None:
514514
data.update({"labels": labels})
515515
response = self._client.request(
516-
url="/load_balancers/{load_balancer_id}".format(
517-
load_balancer_id=load_balancer.id
518-
),
516+
url=f"/load_balancers/{load_balancer.id}",
519517
method="PUT",
520518
json=data,
521519
)
@@ -528,9 +526,7 @@ def delete(self, load_balancer: LoadBalancer | BoundLoadBalancer) -> bool:
528526
:return: boolean
529527
"""
530528
self._client.request(
531-
url="/load_balancers/{load_balancer_id}".format(
532-
load_balancer_id=load_balancer.id
533-
),
529+
url=f"/load_balancers/{load_balancer.id}",
534530
method="DELETE",
535531
)
536532
return True
@@ -567,9 +563,7 @@ def get_actions_list(
567563
params["per_page"] = per_page
568564

569565
response = self._client.request(
570-
url="/load_balancers/{load_balancer_id}/actions".format(
571-
load_balancer_id=load_balancer.id
572-
),
566+
url=f"/load_balancers/{load_balancer.id}/actions",
573567
method="GET",
574568
params=params,
575569
)
@@ -611,9 +605,7 @@ def add_service(
611605
data = self.get_service_parameters(service)
612606

613607
response = self._client.request(
614-
url="/load_balancers/{load_balancer_id}/actions/add_service".format(
615-
load_balancer_id=load_balancer.id
616-
),
608+
url=f"/load_balancers/{load_balancer.id}/actions/add_service",
617609
method="POST",
618610
json=data,
619611
)
@@ -698,9 +690,7 @@ def update_service(
698690
"""
699691
data = self.get_service_parameters(service)
700692
response = self._client.request(
701-
url="/load_balancers/{load_balancer_id}/actions/update_service".format(
702-
load_balancer_id=load_balancer.id
703-
),
693+
url=f"/load_balancers/{load_balancer.id}/actions/update_service",
704694
method="POST",
705695
json=data,
706696
)
@@ -721,9 +711,7 @@ def delete_service(
721711
data: dict[str, Any] = {"listen_port": service.listen_port}
722712

723713
response = self._client.request(
724-
url="/load_balancers/{load_balancer_id}/actions/delete_service".format(
725-
load_balancer_id=load_balancer.id
726-
),
714+
url=f"/load_balancers/{load_balancer.id}/actions/delete_service",
727715
method="POST",
728716
json=data,
729717
)
@@ -753,9 +741,7 @@ def add_target(
753741
data["ip"] = {"ip": target.ip.ip}
754742

755743
response = self._client.request(
756-
url="/load_balancers/{load_balancer_id}/actions/add_target".format(
757-
load_balancer_id=load_balancer.id
758-
),
744+
url=f"/load_balancers/{load_balancer.id}/actions/add_target",
759745
method="POST",
760746
json=data,
761747
)
@@ -782,9 +768,7 @@ def remove_target(
782768
data["ip"] = {"ip": target.ip.ip}
783769

784770
response = self._client.request(
785-
url="/load_balancers/{load_balancer_id}/actions/remove_target".format(
786-
load_balancer_id=load_balancer.id
787-
),
771+
url=f"/load_balancers/{load_balancer.id}/actions/remove_target",
788772
method="POST",
789773
json=data,
790774
)
@@ -805,9 +789,7 @@ def change_algorithm(
805789
data: dict[str, Any] = {"type": algorithm.type}
806790

807791
response = self._client.request(
808-
url="/load_balancers/{load_balancer_id}/actions/change_algorithm".format(
809-
load_balancer_id=load_balancer.id
810-
),
792+
url=f"/load_balancers/{load_balancer.id}/actions/change_algorithm",
811793
method="POST",
812794
json=data,
813795
)
@@ -829,9 +811,7 @@ def change_dns_ptr(
829811
"""
830812

831813
response = self._client.request(
832-
url="/load_balancers/{load_balancer_id}/actions/change_dns_ptr".format(
833-
load_balancer_id=load_balancer.id
834-
),
814+
url=f"/load_balancers/{load_balancer.id}/actions/change_dns_ptr",
835815
method="POST",
836816
json={"ip": ip, "dns_ptr": dns_ptr},
837817
)
@@ -854,9 +834,7 @@ def change_protection(
854834
data.update({"delete": delete})
855835

856836
response = self._client.request(
857-
url="/load_balancers/{load_balancer_id}/actions/change_protection".format(
858-
load_balancer_id=load_balancer.id
859-
),
837+
url=f"/load_balancers/{load_balancer.id}/actions/change_protection",
860838
method="POST",
861839
json=data,
862840
)
@@ -881,9 +859,7 @@ def attach_to_network(
881859
data.update({"ip": ip})
882860

883861
response = self._client.request(
884-
url="/load_balancers/{load_balancer_id}/actions/attach_to_network".format(
885-
load_balancer_id=load_balancer.id
886-
),
862+
url=f"/load_balancers/{load_balancer.id}/actions/attach_to_network",
887863
method="POST",
888864
json=data,
889865
)
@@ -902,9 +878,7 @@ def detach_from_network(
902878
"""
903879
data: dict[str, Any] = {"network": network.id}
904880
response = self._client.request(
905-
url="/load_balancers/{load_balancer_id}/actions/detach_from_network".format(
906-
load_balancer_id=load_balancer.id
907-
),
881+
url=f"/load_balancers/{load_balancer.id}/actions/detach_from_network",
908882
method="POST",
909883
json=data,
910884
)
@@ -922,9 +896,7 @@ def enable_public_interface(
922896
"""
923897

924898
response = self._client.request(
925-
url="/load_balancers/{load_balancer_id}/actions/enable_public_interface".format(
926-
load_balancer_id=load_balancer.id
927-
),
899+
url=f"/load_balancers/{load_balancer.id}/actions/enable_public_interface",
928900
method="POST",
929901
)
930902
return BoundAction(self._client.actions, response["action"])
@@ -941,9 +913,7 @@ def disable_public_interface(
941913
"""
942914

943915
response = self._client.request(
944-
url="/load_balancers/{load_balancer_id}/actions/disable_public_interface".format(
945-
load_balancer_id=load_balancer.id
946-
),
916+
url=f"/load_balancers/{load_balancer.id}/actions/disable_public_interface",
947917
method="POST",
948918
)
949919
return BoundAction(self._client.actions, response["action"])
@@ -962,9 +932,7 @@ def change_type(
962932
"""
963933
data: dict[str, Any] = {"load_balancer_type": load_balancer_type.id_or_name}
964934
response = self._client.request(
965-
url="/load_balancers/{load_balancer_id}/actions/change_type".format(
966-
load_balancer_id=load_balancer.id
967-
),
935+
url=f"/load_balancers/{load_balancer.id}/actions/change_type",
968936
method="POST",
969937
json=data,
970938
)

‎hcloud/networks/client.py‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -420,9 +420,7 @@ def add_subnet(
420420
data["vswitch_id"] = subnet.vswitch_id
421421

422422
response = self._client.request(
423-
url="/networks/{network_id}/actions/add_subnet".format(
424-
network_id=network.id
425-
),
423+
url=f"/networks/{network.id}/actions/add_subnet",
426424
method="POST",
427425
json=data,
428426
)
@@ -443,9 +441,7 @@ def delete_subnet(
443441
data: dict[str, Any] = {"ip_range": subnet.ip_range}
444442

445443
response = self._client.request(
446-
url="/networks/{network_id}/actions/delete_subnet".format(
447-
network_id=network.id
448-
),
444+
url=f"/networks/{network.id}/actions/delete_subnet",
449445
method="POST",
450446
json=data,
451447
)
@@ -469,9 +465,7 @@ def add_route(
469465
}
470466

471467
response = self._client.request(
472-
url="/networks/{network_id}/actions/add_route".format(
473-
network_id=network.id
474-
),
468+
url=f"/networks/{network.id}/actions/add_route",
475469
method="POST",
476470
json=data,
477471
)
@@ -495,9 +489,7 @@ def delete_route(
495489
}
496490

497491
response = self._client.request(
498-
url="/networks/{network_id}/actions/delete_route".format(
499-
network_id=network.id
500-
),
492+
url=f"/networks/{network.id}/actions/delete_route",
501493
method="POST",
502494
json=data,
503495
)
@@ -518,9 +510,7 @@ def change_ip_range(
518510
data: dict[str, Any] = {"ip_range": ip_range}
519511

520512
response = self._client.request(
521-
url="/networks/{network_id}/actions/change_ip_range".format(
522-
network_id=network.id
523-
),
513+
url=f"/networks/{network.id}/actions/change_ip_range",
524514
method="POST",
525515
json=data,
526516
)
@@ -543,9 +533,7 @@ def change_protection(
543533
data.update({"delete": delete})
544534

545535
response = self._client.request(
546-
url="/networks/{network_id}/actions/change_protection".format(
547-
network_id=network.id
548-
),
536+
url=f"/networks/{network.id}/actions/change_protection",
549537
method="POST",
550538
json=data,
551539
)

‎hcloud/placement_groups/client.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,7 @@ def update(
190190
data["name"] = name
191191

192192
response = self._client.request(
193-
url="/placement_groups/{placement_group_id}".format(
194-
placement_group_id=placement_group.id
195-
),
193+
url=f"/placement_groups/{placement_group.id}",
196194
method="PUT",
197195
json=data,
198196
)
@@ -205,9 +203,7 @@ def delete(self, placement_group: PlacementGroup | BoundPlacementGroup) -> bool:
205203
:return: boolean
206204
"""
207205
self._client.request(
208-
url="/placement_groups/{placement_group_id}".format(
209-
placement_group_id=placement_group.id
210-
),
206+
url=f"/placement_groups/{placement_group.id}",
211207
method="DELETE",
212208
)
213209
return True

0 commit comments

Comments
 (0)