Skip to content

Commit d2437f2

Browse files
akxakx
committed
Run flynt to transform formatting to f-strings
1 parent 0d69b77 commit d2437f2

12 files changed

+40
-47
lines changed

‎examples/simple_2way.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515

1616

1717
def print_fader_handler(unused_addr, args, value):
18-
print("[{0}] ~ {1:0.2f}".format(args[0], value))
18+
print(f"[{args[0]}] ~ {value:0.2f}")
1919

2020

2121
def print_xy_fader_handler(unused_addr, args, value1, value2):
22-
print("[{0}] ~ {1:0.2f} ~ {2:0.2f}".format(args[0], value2, value1))
22+
print(f"[{args[0]}] ~ {value2:0.2f} ~ {value1:0.2f}")
2323

2424

2525
if __name__ == "__main__":
@@ -54,7 +54,7 @@ def print_xy_fader_handler(unused_addr, args, value1, value2):
5454
def start_server(ip, port):
5555
print("Starting Server")
5656
server = osc_server.ThreadingOSCUDPServer((ip, port), dispatcher)
57-
print("Serving on {}".format(server.server_address))
57+
print(f"Serving on {server.server_address}")
5858
thread = threading.Thread(target=server.serve_forever)
5959
thread.start()
6060

‎examples/simple_echo_server.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ def echo_handler(client_addr, unused_addr, args):
2626
dispatcher.set_default_handler(echo_handler, True)
2727

2828
server = osc_server.ThreadingOSCUDPServer((args.ip, args.port), dispatcher)
29-
print("Serving on {}".format(server.server_address))
29+
print(f"Serving on {server.server_address}")
3030
server.serve_forever()

‎examples/simple_server.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212

1313

1414
def print_volume_handler(unused_addr, args, volume):
15-
print("[{0}] ~ {1}".format(args[0], volume))
15+
print(f"[{args[0]}] ~ {volume}")
1616

1717

1818
def print_compute_handler(unused_addr, args, volume):
1919
try:
20-
print("[{0}] ~ {1}".format(args[0], args[1](volume)))
20+
print(f"[{args[0]}] ~ {args[1](volume)}")
2121
except ValueError:
2222
pass
2323

@@ -34,5 +34,5 @@ def print_compute_handler(unused_addr, args, volume):
3434
dispatcher.map("/logvolume", print_compute_handler, "Log volume", math.log)
3535

3636
server = osc_server.ThreadingOSCUDPServer((args.ip, args.port), dispatcher)
37-
print("Serving on {}".format(server.server_address))
37+
print(f"Serving on {server.server_address}")
3838
server.serve_forever()

‎examples/simple_tcp_server.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212

1313

1414
def print_volume_handler(unused_addr, args, volume):
15-
print("[{0}] ~ {1}".format(args[0], volume))
15+
print(f"[{args[0]}] ~ {volume}")
1616

1717

1818
def print_compute_handler(unused_addr, args, volume):
1919
try:
20-
print("[{0}] ~ {1}".format(args[0], args[1](volume)))
20+
print(f"[{args[0]}] ~ {args[1](volume)}")
2121
except ValueError:
2222
pass
2323

@@ -42,5 +42,5 @@ def print_compute_handler(unused_addr, args, volume):
4242
server = osc_tcp_server.ThreadingOSCTCPServer(
4343
(args.ip, args.port), dispatcher, mode=args.mode
4444
)
45-
print("Serving on {}".format(server.server_address))
45+
print(f"Serving on {server.server_address}")
4646
server.serve_forever()

‎pythonosc/dispatcher.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@ def unmap(self, address, handler, *args, needs_reply_address=False):
175175
except ValueError as e:
176176
if str(e) == "list.remove(x): x not in list":
177177
raise ValueError(
178-
"Address '%s' doesn't have handler '%s' mapped to it"
179-
% (address, handler)
178+
f"Address '{address}' doesn't have handler '{handler}' mapped to it"
180179
) from e
181180

182181
def handlers_for_address(

‎pythonosc/osc_bundle.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def __init__(self, dgram: bytes) -> None:
3333
try:
3434
self._timestamp, index = osc_types.get_date(self._dgram, index)
3535
except osc_types.ParseError as pe:
36-
raise ParseError("Could not get the date from the datagram: %s" % pe)
36+
raise ParseError(f"Could not get the date from the datagram: {pe}")
3737
# Get the contents as a list of OscBundle and OscMessage.
3838
self._contents = self._parse_contents(index)
3939

@@ -61,10 +61,10 @@ def _parse_contents(
6161
contents.append(osc_message.OscMessage(content_dgram))
6262
else:
6363
logging.warning(
64-
"Could not identify content type of dgram %r" % content_dgram
64+
f"Could not identify content type of dgram {content_dgram!r}"
6565
)
6666
except (osc_types.ParseError, osc_message.ParseError, IndexError) as e:
67-
raise ParseError("Could not parse a content datagram: %s" % e)
67+
raise ParseError(f"Could not parse a content datagram: {e}")
6868

6969
return contents
7070

‎pythonosc/osc_bundle_builder.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ def build(self) -> osc_bundle.OscBundle:
5858
)
5959
return osc_bundle.OscBundle(dgram)
6060
except osc_types.BuildError as be:
61-
raise BuildError("Could not build the bundle {}".format(be))
61+
raise BuildError(f"Could not build the bundle {be}")

‎pythonosc/osc_message.py

+3-7
Original file line numberDiff line numberDiff line change
@@ -73,21 +73,17 @@ def _parse_datagram(self) -> None:
7373
elif param == "]": # Array stop.
7474
if len(param_stack) < 2:
7575
raise ParseError(
76-
"Unexpected closing bracket in type tag: {0}".format(
77-
type_tag
78-
)
76+
f"Unexpected closing bracket in type tag: {type_tag}"
7977
)
8078
param_stack.pop()
8179
# TODO: Support more exotic types as described in the specification.
8280
else:
83-
logging.warning("Unhandled parameter type: {0}".format(param))
81+
logging.warning(f"Unhandled parameter type: {param}")
8482
continue
8583
if param not in "[]":
8684
param_stack[-1].append(val)
8785
if len(param_stack) != 1:
88-
raise ParseError(
89-
"Missing closing bracket in type tag: {0}".format(type_tag)
90-
)
86+
raise ParseError(f"Missing closing bracket in type tag: {type_tag}")
9187
self._parameters = params
9288
except osc_types.ParseError as pe:
9389
raise ParseError("Found incorrect datagram, ignoring it", pe)

‎pythonosc/osc_message_builder.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,11 @@ def build(self) -> osc_message.OscMessage:
188188
):
189189
continue
190190
else:
191-
raise BuildError(
192-
"Incorrect parameter type found {}".format(arg_type)
193-
)
191+
raise BuildError(f"Incorrect parameter type found {arg_type}")
194192

195193
return osc_message.OscMessage(dgram)
196194
except osc_types.BuildError as be:
197-
raise BuildError("Could not build the message: {}".format(be))
195+
raise BuildError(f"Could not build the message: {be}")
198196

199197

200198
def build_msg(address: str, value: ArgValue = "") -> osc_message.OscMessage:

‎pythonosc/osc_packet.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def __init__(self, dgram: bytes) -> None:
7676
"OscBundle."
7777
)
7878
except (osc_bundle.ParseError, osc_message.ParseError) as pe:
79-
raise ParseError("Could not parse packet %s" % pe)
79+
raise ParseError(f"Could not parse packet {pe}")
8080

8181
@property
8282
def messages(self) -> List[TimedMessage]:

‎pythonosc/parsing/osc_types.py

+17-17
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def write_string(val: str) -> bytes:
4343
try:
4444
dgram = val.encode("utf-8") # Default, but better be explicit.
4545
except (UnicodeEncodeError, AttributeError) as e:
46-
raise BuildError("Incorrect string, could not encode {}".format(e))
46+
raise BuildError(f"Incorrect string, could not encode {e}")
4747
diff = _STRING_DGRAM_PAD - (len(dgram) % _STRING_DGRAM_PAD)
4848
dgram += b"\x00" * diff
4949
return dgram
@@ -90,9 +90,9 @@ def get_string(dgram: bytes, start_index: int) -> Tuple[str, int]:
9090
data_str = dgram[start_index : start_index + offset]
9191
return data_str.replace(b"\x00", b"").decode("utf-8"), start_index + offset
9292
except IndexError as ie:
93-
raise ParseError("Could not parse datagram %s" % ie)
93+
raise ParseError(f"Could not parse datagram {ie}")
9494
except TypeError as te:
95-
raise ParseError("Could not parse datagram %s" % te)
95+
raise ParseError(f"Could not parse datagram {te}")
9696

9797

9898
def write_int(val: int) -> bytes:
@@ -104,7 +104,7 @@ def write_int(val: int) -> bytes:
104104
try:
105105
return struct.pack(">i", val)
106106
except struct.error as e:
107-
raise BuildError("Wrong argument value passed: {}".format(e))
107+
raise BuildError(f"Wrong argument value passed: {e}")
108108

109109

110110
def get_int(dgram: bytes, start_index: int) -> Tuple[int, int]:
@@ -128,7 +128,7 @@ def get_int(dgram: bytes, start_index: int) -> Tuple[int, int]:
128128
start_index + _INT_DGRAM_LEN,
129129
)
130130
except (struct.error, TypeError) as e:
131-
raise ParseError("Could not parse datagram %s" % e)
131+
raise ParseError(f"Could not parse datagram {e}")
132132

133133

134134
def write_int64(val: int) -> bytes:
@@ -140,7 +140,7 @@ def write_int64(val: int) -> bytes:
140140
try:
141141
return struct.pack(">q", val)
142142
except struct.error as e:
143-
raise BuildError("Wrong argument value passed: {}".format(e))
143+
raise BuildError(f"Wrong argument value passed: {e}")
144144

145145

146146
def get_int64(dgram: bytes, start_index: int) -> Tuple[int, int]:
@@ -164,7 +164,7 @@ def get_int64(dgram: bytes, start_index: int) -> Tuple[int, int]:
164164
start_index + _INT64_DGRAM_LEN,
165165
)
166166
except (struct.error, TypeError) as e:
167-
raise ParseError("Could not parse datagram %s" % e)
167+
raise ParseError(f"Could not parse datagram {e}")
168168

169169

170170
def get_uint64(dgram: bytes, start_index: int) -> Tuple[int, int]:
@@ -190,7 +190,7 @@ def get_uint64(dgram: bytes, start_index: int) -> Tuple[int, int]:
190190
start_index + _UINT64_DGRAM_LEN,
191191
)
192192
except (struct.error, TypeError) as e:
193-
raise ParseError("Could not parse datagram %s" % e)
193+
raise ParseError(f"Could not parse datagram {e}")
194194

195195

196196
def get_timetag(dgram: bytes, start_index: int) -> Tuple[Tuple[datetime, int], int]:
@@ -223,7 +223,7 @@ def get_timetag(dgram: bytes, start_index: int) -> Tuple[Tuple[datetime, int], i
223223

224224
return (utc, fraction), start_index + _TIMETAG_DGRAM_LEN
225225
except (struct.error, TypeError) as e:
226-
raise ParseError("Could not parse datagram %s" % e)
226+
raise ParseError(f"Could not parse datagram {e}")
227227

228228

229229
def write_float(val: float) -> bytes:
@@ -235,7 +235,7 @@ def write_float(val: float) -> bytes:
235235
try:
236236
return struct.pack(">f", val)
237237
except struct.error as e:
238-
raise BuildError("Wrong argument value passed: {}".format(e))
238+
raise BuildError(f"Wrong argument value passed: {e}")
239239

240240

241241
def get_float(dgram: bytes, start_index: int) -> Tuple[float, int]:
@@ -262,7 +262,7 @@ def get_float(dgram: bytes, start_index: int) -> Tuple[float, int]:
262262
start_index + _FLOAT_DGRAM_LEN,
263263
)
264264
except (struct.error, TypeError) as e:
265-
raise ParseError("Could not parse datagram %s" % e)
265+
raise ParseError(f"Could not parse datagram {e}")
266266

267267

268268
def write_double(val: float) -> bytes:
@@ -274,7 +274,7 @@ def write_double(val: float) -> bytes:
274274
try:
275275
return struct.pack(">d", val)
276276
except struct.error as e:
277-
raise BuildError("Wrong argument value passed: {}".format(e))
277+
raise BuildError(f"Wrong argument value passed: {e}")
278278

279279

280280
def get_double(dgram: bytes, start_index: int) -> Tuple[float, int]:
@@ -300,7 +300,7 @@ def get_double(dgram: bytes, start_index: int) -> Tuple[float, int]:
300300
start_index + _DOUBLE_DGRAM_LEN,
301301
)
302302
except (struct.error, TypeError) as e:
303-
raise ParseError("Could not parse datagram {}".format(e))
303+
raise ParseError(f"Could not parse datagram {e}")
304304

305305

306306
def get_blob(dgram: bytes, start_index: int) -> Tuple[bytes, int]:
@@ -393,7 +393,7 @@ def write_rgba(val: bytes) -> bytes:
393393
try:
394394
return struct.pack(">I", val)
395395
except struct.error as e:
396-
raise BuildError("Wrong argument value passed: {}".format(e))
396+
raise BuildError(f"Wrong argument value passed: {e}")
397397

398398

399399
def get_rgba(dgram: bytes, start_index: int) -> Tuple[bytes, int]:
@@ -417,7 +417,7 @@ def get_rgba(dgram: bytes, start_index: int) -> Tuple[bytes, int]:
417417
start_index + _INT_DGRAM_LEN,
418418
)
419419
except (struct.error, TypeError) as e:
420-
raise ParseError("Could not parse datagram %s" % e)
420+
raise ParseError(f"Could not parse datagram {e}")
421421

422422

423423
def write_midi(val: MidiPacket) -> bytes:
@@ -435,7 +435,7 @@ def write_midi(val: MidiPacket) -> bytes:
435435
value = sum((value & 0xFF) << 8 * (3 - pos) for pos, value in enumerate(val))
436436
return struct.pack(">I", value)
437437
except struct.error as e:
438-
raise BuildError("Wrong argument value passed: {}".format(e))
438+
raise BuildError(f"Wrong argument value passed: {e}")
439439

440440

441441
def get_midi(dgram: bytes, start_index: int) -> Tuple[MidiPacket, int]:
@@ -460,4 +460,4 @@ def get_midi(dgram: bytes, start_index: int) -> Tuple[MidiPacket, int]:
460460
)
461461
return (midi_msg, start_index + _INT_DGRAM_LEN)
462462
except (struct.error, TypeError) as e:
463-
raise ParseError("Could not parse datagram %s" % e)
463+
raise ParseError(f"Could not parse datagram {e}")

‎scripts/print_datagrams_main.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ def main():
1616
def _PrintOscMessages(ip, port):
1717
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
1818
sock.bind((ip, port))
19-
print("Listening for UDP packets on {0}:{1} ...".format(ip, port))
19+
print(f"Listening for UDP packets on {ip}:{port} ...")
2020
while True:
2121
data, _ = sock.recvfrom(1024)
22-
print("%s" % data)
22+
print(f"{data}")
2323

2424

2525
if __name__ == "__main__":

0 commit comments

Comments
 (0)