Merge pull request julien-duponchelle#570 from HongGeonUi/enhancement/f-string/HongGeonUi3

dongwook-chan · web-flow · commit fbeaeadabfdf · 2023-10-21T18:19:44.000+09:00
Fix: Apply f-string binlogstream.py L135:L141
diff --git a/pymysqlreplication/binlogstream.py b/pymysqlreplication/binlogstream.py
@@ -132,13 +132,13 @@ def encoded(self, server_id, master_id=0):
             + bytes(bytearray([COM_REGISTER_SLAVE]))
             + struct.pack("<L", server_id)
             + struct.pack(
-                "<%dp" % min(MAX_STRING_LEN, lhostname + 1), self.hostname.encode()
+                f"<{min(MAX_STRING_LEN, lhostname + 1)}p", self.hostname.encode()
             )
             + struct.pack(
-                "<%dp" % min(MAX_STRING_LEN, lusername + 1), self.username.encode()
+                f"<{min(MAX_STRING_LEN, lusername + 1)}p", self.username.encode()
             )
             + struct.pack(
-                "<%dp" % min(MAX_STRING_LEN, lpassword + 1), self.password.encode()
+                f"<{min(MAX_STRING_LEN, lpassword + 1)}p", self.password.encode()
             )
             + struct.pack("<H", self.port)
             + struct.pack("<l", 0)

Original file line number	Diff line number	Diff line change
`@@ -132,13 +132,13 @@ def encoded(self, server_id, master_id=0):`
`132`	`132`	`+ bytes(bytearray([COM_REGISTER_SLAVE]))`
`133`	`133`	`+ struct.pack("<L", server_id)`
`134`	`134`	`+ struct.pack(`
`135`		`- "<%dp" % min(MAX_STRING_LEN, lhostname + 1), self.hostname.encode()`
	`135`	`+ f"<{min(MAX_STRING_LEN, lhostname + 1)}p", self.hostname.encode()`
`136`	`136`	`)`
`137`	`137`	`+ struct.pack(`
`138`		`- "<%dp" % min(MAX_STRING_LEN, lusername + 1), self.username.encode()`
	`138`	`+ f"<{min(MAX_STRING_LEN, lusername + 1)}p", self.username.encode()`
`139`	`139`	`)`
`140`	`140`	`+ struct.pack(`
`141`		`- "<%dp" % min(MAX_STRING_LEN, lpassword + 1), self.password.encode()`
	`141`	`+ f"<{min(MAX_STRING_LEN, lpassword + 1)}p", self.password.encode()`
`142`	`142`	`)`
`143`	`143`	`+ struct.pack("<H", self.port)`
`144`	`144`	`+ struct.pack("<l", 0)`