refactor: f string row_event.py

Author: mirageoasis

pymysqlreplication/event.py

@@ -62,14 +62,11 @@ def _verify_event(self):
  self.packet.rewind(20)
 
  def dump(self):
- print("=== %s ===" % (self.__class__.__name__))
- print(
- "Date: %s"
- % (datetime.datetime.utcfromtimestamp(self.timestamp).isoformat())
- )
- print("Log position: %d" % self.packet.log_pos)
- print("Event size: %d" % (self.event_size))
- print("Read bytes: %d" % (self.packet.read_bytes))
+ print(f"=== {self.__class__.__name__} ===")
+ print(f"Date: {datetime.datetime.utcfromtimestamp(self.timestamp).isoformat()}")
+ print(f"Log position: {self.packet.log_pos}")
+ print(f"Event size: {self.event_size}")
+ print(f"Read bytes: {self.packet.read_bytes}")
  self._dump()
  print()
 
@@ -123,14 +120,14 @@ def gtid(self):
  return gtid
 
  def _dump(self):
- print("Commit: %s" % self.commit_flag)
- print("GTID_NEXT: %s" % self.gtid)
+ print(f"Commit: {self.commit_flag}")
+ print(f"GTID_NEXT: {self.gtid}")
  if hasattr(self, "last_committed"):
- print("last_committed: %d" % self.last_committed)
- print("sequence_number: %d" % self.sequence_number)
+ print(f"last_committed: {self.last_committed}")
+ print(f"sequence_number: {self.sequence_number}")
 
  def __repr__(self):
- return '<GtidEvent "%s">' % self.gtid
+ return f'<GtidEvent "{self.gtid}">'
 
 
 class PreviousGtidsEvent(BinLogEvent):
@@ -172,10 +169,10 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
  self._previous_gtids = ",".join(self._gtids)
 
  def _dump(self):
- print("previous_gtids: %s" % self._previous_gtids)
+ print(f"previous_gtids: {self._previous_gtids}")
 
  def __repr__(self):
- return '<PreviousGtidsEvent "%s">' % self._previous_gtids
+ return f'<PreviousGtidsEvent "{self._previous_gtids}">'
 
 
 class MariadbGtidEvent(BinLogEvent):
@@ -198,12 +195,12 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
  self.gtid_seq_no = self.packet.read_uint64()
  self.domain_id = self.packet.read_uint32()
  self.flags = self.packet.read_uint8()
- self.gtid = "%d-%d-%d" % (self.domain_id, self.server_id, self.gtid_seq_no)
+ self.gtid = f"{self.domain_id}-{self.server_id}-{self.gtid_seq_no}"
 
  def _dump(self):
  super()._dump()
- print("Flags:", self.flags)
- print("GTID:", self.gtid)
+ print(f"Flags: {self.flags}")
+ print(f"GTID: {self.gtid}")
 
 
 class MariadbBinLogCheckPointEvent(BinLogEvent):
@@ -225,7 +222,7 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
  self.filename = self.packet.read(filename_length).decode()
 
  def _dump(self):
- print("Filename:", self.filename)
+ print(f"Filename: {self.filename}")
 
 
 class MariadbAnnotateRowsEvent(BinLogEvent):
@@ -243,7 +240,7 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
 
  def _dump(self):
  super()._dump()
- print("SQL statement :", self.sql_statement)
+ print(f"SQL statement : {self.sql_statement}")
 
 
 class MariadbGtidListEvent(BinLogEvent):
@@ -280,11 +277,7 @@ def __init__(
  self.domain_id = self.packet.read_uint32()
  self.server_id = self.packet.read_uint32()
  self.gtid_seq_no = self.packet.read_uint64()
- self.gtid = "%d-%d-%d" % (
- self.domain_id,
- self.server_id,
- self.gtid_seq_no,
- )
+ self.gtid = f"{self.domain_id}-{self.server_id}-{self.gtid_seq_no}"
 
  self.gtid_length = self.packet.read_uint32()
  self.gtid_list = [
@@ -312,9 +305,9 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
  self.next_binlog = self.packet.read(event_size - 8).decode()
 
  def dump(self):
- print("=== %s ===" % (self.__class__.__name__))
- print("Position: %d" % self.position)
- print("Next binlog file: %s" % self.next_binlog)
+ print(f"=== {self.__class__.__name__} ===")
+ print(f"Position: {self.position}")
+ print(f"Next binlog file: {self.next_binlog}")
  print()
 
 
@@ -347,9 +340,9 @@ def xid(self):
  return self.xid_gtrid.decode() + self.xid_bqual.decode()
 
  def _dump(self):
- print("One phase: %s" % self.one_phase)
- print("XID formatID: %d" % self.xid_format_id)
- print("XID: %s" % self.xid)
+ print(f"One phase: {self.one_phase}")
+ print(f"XID formatID: {self.xid_format_id}")
+ print(f"XID: {self.xid}")
 
 
 class FormatDescriptionEvent(BinLogEvent):
@@ -371,8 +364,8 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
  self.mysql_version = tuple(map(int, numbers.split(".")))
 
  def _dump(self):
- print("Binlog version: %s" % self.binlog_version)
- print("MySQL version: %s" % self.mysql_version_str)
+ print(f"Binlog version: {self.binlog_version}")
+ print(f"MySQL version: {self.mysql_version_str}")
 
 
 class StopEvent(BinLogEvent):
@@ -394,7 +387,7 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
 
  def _dump(self):
  super()._dump()
- print("Transaction ID: %d" % (self.xid))
+ print(f"Transaction ID: {self.xid}")
 
 
 class HeartbeatLogEvent(BinLogEvent):
@@ -427,7 +420,7 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
 
  def _dump(self):
  super()._dump()
- print("Current binlog: %s" % (self.ident))
+ print(f"Current binlog: {self.indent}")
 
 
 class QueryEvent(BinLogEvent):
@@ -473,9 +466,9 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
 
  def _dump(self):
  super()._dump()
- print("Schema: %s" % (self.schema))
- print("Execution time: %d" % (self.execution_time))
- print("Query: %s" % (self.query))
+ print(f"Schema: {self.schema}" % (self.schema))
+ print(f"Execution time: {self.execution_time}")
+ print(f"Query: {self.query}")
 
  def _read_status_vars_value_for_key(self, key):
  """parse status variable VALUE for given KEY
@@ -582,8 +575,8 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
 
  def _dump(self):
  super()._dump()
- print("File id: %d" % (self.file_id))
- print("Block data: %s" % (self.block_data))
+ print(f"File id: {self.file_id}")
+ print(f"Block data: {self.block_data}")
 
 
 class ExecuteLoadQueryEvent(BinLogEvent):
@@ -622,15 +615,15 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
 
  def _dump(self):
  super(ExecuteLoadQueryEvent, self)._dump()
- print("Slave proxy id: %d" % (self.slave_proxy_id))
- print("Execution time: %d" % (self.execution_time))
- print("Schema length: %d" % (self.schema_length))
- print("Error code: %d" % (self.error_code))
- print("Status vars length: %d" % (self.status_vars_length))
- print("File id: %d" % (self.file_id))
- print("Start pos: %d" % (self.start_pos))
- print("End pos: %d" % (self.end_pos))
- print("Dup handling flags: %d" % (self.dup_handling_flags))
+ print(f"Slave proxy id: {self.slave_proxy_id}")
+ print(f"Execution time: {self.execution_time}")
+ print(f"Schema length: {self.schema_length}")
+ print(f"Error code: {self.error_code}")
+ print(f"Status vars length: {self.status_vars_length}")
+ print(f"File id: {self.file_id}")
+ print(f"Start pos: {self.start_pos}")
+ print(f"End pos: {self.end_pos}")
+ print(f"Dup handling flags: {self.dup_handling_flags}")
 
 
 class IntvarEvent(BinLogEvent):
@@ -652,8 +645,8 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
 
  def _dump(self):
  super()._dump()
- print("type: %d" % (self.type))
- print("Value: %d" % (self.value))
+ print(f"type: {self.type}")
+ print(f"Value: {self.value}")
 
 
 class RandEvent(BinLogEvent):
@@ -686,8 +679,8 @@ def seed2(self):
 
  def _dump(self):
  super()._dump()
- print("seed1: %d" % (self.seed1))
- print("seed2: %d" % (self.seed2))
+ print(f"seed1: {self.seed1}")
+ print(f"seed2: {self.seed2}")
 
 
 class UserVarEvent(BinLogEvent):
@@ -793,16 +786,15 @@ def _read_default(self) -> bytes:
 
  def _dump(self) -> None:
  super(UserVarEvent, self)._dump()
- print("User variable name: %s" % self.name)
- print("Is NULL: %s" % ("Yes" if self.is_null else "No"))
+ print(f"User variable name: {self.name}")
+ print(f'Is NULL: {"Yes" if self.is_null else "No"}')
  if not self.is_null:
  print(
- "Type: %s"
- % self.type_to_codes_and_method.get(self.type, ["UNKNOWN_TYPE"])[0]
+ f'Type: {self.type_to_codes_and_method.get(self.type, ["UNKNOWN_TYPE"])[0]}'
  )
- print("Charset: %s" % self.charset)
- print("Value: %s" % self.value)
- print("Flags: %s" % self.flags)
+ print(f"Charset: {self.charset}")
+ print(f"Value: {self.value}")
+ print(f"Flags: {self.flags}")
 
 
 class MariadbStartEncryptionEvent(BinLogEvent):
@@ -829,8 +821,8 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
  self.nonce = self.packet.read(12)
 
  def _dump(self):
- print("Schema: %d" % self.schema)
- print("Key version: %d" % self.key_version)
+ print(f"Schema: {self.schema}")
+ print(f"Key version: {self.key_version}")
  print(f"Nonce: {self.nonce}")
 
 
@@ -853,9 +845,9 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
  self.query = self.packet.read(self.query_length).decode("utf-8")
 
  def dump(self):
- print("=== %s ===" % (self.__class__.__name__))
- print("Query length: %d" % self.query_length)
- print("Query: %s" % self.query)
+ print(f"=== {self.__class__.__name__} ===")
+ print(f"Query length: {self.query_length}")
+ print(f"Query: {self.query}")
 
 
 class NotImplementedEvent(BinLogEvent):

pymysqlreplication/exceptions.py

@@ -1,6 +1,6 @@
 class TableMetadataUnavailableError(Exception):
  def __init__(self, table):
- Exception.__init__(self, "Unable to find metadata for table {0}".format(table))
+ Exception.__init__(self, f"Unable to find metadata for table {table}")
 
 
 class BinLogNotEnabled(Exception):
@@ -13,10 +13,12 @@ def __init__(self):
  Exception.__init__(
  self,
  " ".join(
- "Unknown status variable in query event.",
- "Possible parse failure in preceding fields",
- "or outdated constants.STATUS_VAR_KEY",
- "Refer to MySQL documentation/source code",
- "or create an issue on GitHub",
+ (
+ "Unknown status variable in query event.",
+ "Possible parse failure in preceding fields",
+ "or outdated constants.STATUS_VAR_KEY",
+ "Refer to MySQL documentation/source code",
+ "or create an issue on GitHub",
+ )
  ),
  )