Skip to content

Commit 0c3a928

Browse files
s0undt3chm-czernek
authored andcommitted
Update code to be Py3.7+ to reduce merge forward conflicts
1 parent 6494070 commit 0c3a928

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/saltext/libvirt_events/engines/libvirt_events.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ def _get_domain_event_detail(event, detail):
189189
if event_name == "unknown":
190190
return event_name, "unknown"
191191

192-
prefix = "VIR_DOMAIN_EVENT_{}_".format(event_name.upper())
192+
prefix = f"VIR_DOMAIN_EVENT_{event_name.upper()}_"
193193
detail_name = _get_libvirt_enum_string(prefix, detail)
194194

195195
return event_name, detail_name
@@ -333,9 +333,7 @@ def get_address(addr):
333333
transform address structure into event data piece
334334
"""
335335
return {
336-
"family": _get_libvirt_enum_string(
337-
"{}_ADDRESS_".format(prefix), addr["family"]
338-
),
336+
"family": _get_libvirt_enum_string(f"{prefix}_ADDRESS_", addr["family"]),
339337
"node": addr["node"],
340338
"service": addr["service"],
341339
}
@@ -680,14 +678,14 @@ def _register_callback(cnx, tag_prefix, obj, event, real_id):
680678
"""
681679
libvirt_name = real_id
682680
if real_id is None:
683-
libvirt_name = "VIR_{}_EVENT_ID_{}".format(obj, event).upper()
681+
libvirt_name = f"VIR_{obj}_EVENT_ID_{event}".upper()
684682

685683
if not hasattr(libvirt, libvirt_name):
686684
log.warning('Skipping "%s/%s" events: libvirt too old', obj, event)
687685
return None
688686

689687
libvirt_id = getattr(libvirt, libvirt_name)
690-
callback_name = "_{}_event_{}_cb".format(obj, event)
688+
callback_name = f"_{obj}_event_{event}_cb"
691689
callback = globals().get(callback_name, None)
692690
if callback is None:
693691
log.error("Missing function %s in engine", callback_name)

0 commit comments

Comments
 (0)