convert to f-string formatting

Baekalfen · Baekalfen · commit c3098aa74dbd · 2022-09-15T18:38:21.000+02:00
diff --git a/pyboy/core/cartridge/base_mbc.py b/pyboy/core/cartridge/base_mbc.py
@@ -112,12 +112,11 @@ def setitem(self, address, value):
     def overrideitem(self, rom_bank, address, value):
         if 0x0000 <= address < 0x4000:
             logger.debug(
-                "Performing overwrite on address: %s:%s. New value: %s Old value: %s" %
-                (hex(rom_bank), hex(address), hex(value), self.rombanks[rom_bank][address])
+                f"Performing overwrite on address: {rom_bank:02x}:{address:04x}. New value: {value:02x} Old value: {self.rombanks[rom_bank][address]:02x}"
             )
             self.rombanks[rom_bank][address] = value
         else:
-            logger.error("Invalid override address: %s" % hex(address))
+            logger.error(f"Invalid override address: {address:04x}")
 
     def getitem(self, address):
         if 0x0000 <= address < 0x4000:
@@ -126,7 +125,7 @@ def getitem(self, address):
             return self.rombanks[self.rombank_selected % len(self.rombanks)][address - 0x4000]
         elif 0xA000 <= address < 0xC000:
             if not self.rambank_initialized:
-                logger.error("RAM banks not initialized: %s" % hex(address))
+                logger.error(f"RAM banks not initialized: {address:04x}")
 
             if not self.rambank_enabled:
                 return 0xFF
@@ -136,22 +135,22 @@ def getitem(self, address):
             else:
                 return self.rambanks[self.rambank_selected % self.external_ram_count][address - 0xA000]
         else:
-            logger.error("Reading address invalid: %s" % address)
+            logger.error(f"Reading address invalid: {address:04x}")
 
     def __repr__(self):
         return "\n".join([
             "Cartridge:",
-            "Filename: %s" % self.filename,
-            "Game name: %s" % self.gamename,
-            "GB Color: %s" % str(self.ROMBanks[0][0x143] == 0x80),
-            "Cartridge type: %s" % hex(self.cartType),
-            "Number of ROM banks: %s" % self.external_rom_count,
-            "Active ROM bank: %s" % self.rombank_selected,
-            # "Memory bank type: %s" % self.ROMBankController,
-            "Number of RAM banks: %s" % len(self.rambanks),
-            "Active RAM bank: %s" % self.rambank_selected,
-            "Battery: %s" % self.battery,
-            "RTC: %s" % self.rtc
+            f"Filename: {self.filename}",
+            f"Game name: {self.gamename}",
+            f"GB Color: {self.ROMBanks[0][0x143] == 0x80}",
+            f"Cartridge type: {self.cartType:02x}",
+            f"Number of ROM banks: {self.external_rom_count}",
+            f"Active ROM bank: {self.rombank_selected}",
+            # f"Memory bank type: {self.ROMBankController}",
+            f"Number of RAM banks: {len(self.rambanks)}",
+            f"Active RAM bank: {self.rambank_selected}",
+            f"Battery: {self.battery}",
+            f"RTC: {self.rtc}"
         ])
 
 
@@ -161,16 +160,14 @@ def setitem(self, address, value):
             if value == 0:
                 value = 1
             self.rombank_selected = (value & 0b1)
-            logger.debug("Switching bank 0x%0.4x, 0x%0.2x" % (address, value))
+            logger.debug(f"Switching bank 0x{address:04x}, 0x{value:02x}")
         elif 0xA000 <= address < 0xC000:
             if self.rambanks is None:
                 from . import EXTERNAL_RAM_TABLE
                 logger.warning(
-                    "Game tries to set value 0x%0.2x at RAM address 0x%0.4x, but "
-                    "RAM banks are not initialized. Initializing %d RAM banks as "
-                    "precaution" % (value, address, EXTERNAL_RAM_TABLE[0x02])
+                    f"Game tries to set value 0x{value:02x} at RAM address 0x{address:04x}, but RAM banks are not initialized. Initializing {EXTERNAL_RAM_TABLE[0x02]} RAM banks as precaution"
                 )
                 self.init_rambanks(EXTERNAL_RAM_TABLE[0x02])
             self.rambanks[self.rambank_selected][address - 0xA000] = value
         else:
-            logger.warning("Unexpected write to 0x%0.4x, value: 0x%0.2x" % (address, value))
+            logger.warning("Unexpected write to 0x{address:04x}, value: 0x{value:02x}")
diff --git a/pyboy/core/cartridge/cartridge.py b/pyboy/core/cartridge/cartridge.py
@@ -32,13 +32,11 @@ def load_cartridge(filename):
     carttype = rombanks[0][0x0147]
     cartinfo = CARTRIDGE_TABLE.get(carttype, None)
     if cartinfo is None:
-        raise Exception("Catridge type invalid: %s" % carttype)
+        raise Exception(f"Catridge type invalid: {carttype}")
 
-    cartdata = (
-        carttype, cartinfo[0].__name__, ", ".join([x for x, y in zip(["SRAM", "Battery", "RTC"], cartinfo[1:]) if y])
-    )
-    logger.info("Cartridge type: 0x%0.2x - %s, %s" % cartdata)
-    logger.info("Cartridge size: %d ROM banks of 16KB, %s RAM banks of 8KB" % (len(rombanks), external_ram_count))
+    cartdata = (", ".join([x for x, y in zip(["SRAM", "Battery", "RTC"], cartinfo[1:]) if y]))
+    logger.info(f"Cartridge type: 0x{carttype:02x} - {cartinfo[0].__name__}, {cartdata}")
+    logger.info(f"Cartridge size: {len(rombanks)} ROM banks of 16KB, {external_ram_count} RAM banks of 8KB")
     cartmeta = CARTRIDGE_TABLE[carttype]
 
     return cartmeta[0](filename, rombanks, external_ram_count, carttype, *cartmeta[1:])
diff --git a/pyboy/core/cartridge/mbc1.py b/pyboy/core/cartridge/mbc1.py
@@ -33,17 +33,17 @@ def setitem(self, address, value):
         elif 0xA000 <= address < 0xC000:
             if self.rambanks is None:
                 logger.warning(
-                    "Game tries to set value 0x%0.2x at RAM address 0x%0.4x, but RAM "
-                    "banks are not initialized. Initializing %d RAM banks as "
-                    "precaution" % (value, address, self.external_ram_count)
+                    f"Game tries to set value 0x{value:02x} at RAM address 0x{address:04x}, but RAM "
+                    f"banks are not initialized. Initializing {self.external_ram_count} RAM banks as "
+                    "precaution"
                 )
                 self.init_rambanks(self.external_ram_count)
 
             if self.rambank_enabled:
                 self.rambank_selected = self.bank_select_register2 if self.memorymodel == 1 else 0
                 self.rambanks[self.rambank_selected % self.external_ram_count][address - 0xA000] = value
         else:
-            logger.error("Invalid writing address: %s" % hex(address))
+            logger.error(f"Invalid writing address: {address:04x}")
 
     def getitem(self, address):
         if 0x0000 <= address < 0x4000:
@@ -58,7 +58,7 @@ def getitem(self, address):
             return self.rombanks[self.rombank_selected % len(self.rombanks)][address - 0x4000]
         elif 0xA000 <= address < 0xC000:
             if not self.rambank_initialized:
-                logger.error("RAM banks not initialized: %s" % hex(address))
+                logger.error(f"RAM banks not initialized: {address:04x}")
 
             if not self.rambank_enabled:
                 return 0xFF
@@ -69,7 +69,7 @@ def getitem(self, address):
                 self.rambank_selected = 0
             return self.rambanks[self.rambank_selected % self.external_ram_count][address - 0xA000]
         else:
-            logger.error("Reading address invalid: %s" % address)
+            logger.error(f"Reading address invalid: {address:04x}")
 
     def save_state(self, f):
         # Cython doesn't like super()
diff --git a/pyboy/core/cartridge/mbc2.py b/pyboy/core/cartridge/mbc2.py
@@ -23,16 +23,15 @@ def setitem(self, address, value):
         elif 0xA000 <= address < 0xC000:
             if self.rambanks is None:
                 logger.warning(
-                    "Game tries to set value 0x%0.2x at RAM address 0x%0.4x, but RAM "
-                    "banks are not initialized. Initializing %d RAM banks as "
-                    "precaution" % (value, address, self.external_ram_count)
+                    f"Game tries to set value 0x{value:02x} at RAM address 0x{address:04x}, but RAM "
+                    f"banks are not initialized. Initializing {self.external_ram_count} RAM banks as precaution"
                 )
                 self.init_rambanks(self.external_ram_count)
             if self.rambank_enabled:
                 # MBC2 includes built-in RAM of 512 x 4 bits (Only the 4 LSBs are used)
                 self.rambanks[0][address % 512] = value | 0b11110000
         else:
-            logger.error("Unexpected write to 0x%0.4x, value: 0x%0.2x" % (address, value))
+            logger.error(f"Unexpected write to 0x{address:04x}, value: 0x{value:02x}")
 
     def getitem(self, address):
         if 0x0000 <= address < 0x4000:
@@ -41,12 +40,12 @@ def getitem(self, address):
             return self.rombanks[self.rombank_selected % len(self.rombanks)][address - 0x4000]
         elif 0xA000 <= address < 0xC000:
             if not self.rambank_initialized:
-                logger.error("RAM banks not initialized: %s" % hex(address))
+                logger.error(f"RAM banks not initialized: {address:04x}")
 
             if not self.rambank_enabled:
                 return 0xFF
 
             else:
                 return self.rambanks[0][address % 512] | 0b11110000
         else:
-            logger.error("Reading address invalid: %s" % address)
+            logger.error(f"Reading address invalid: {address:04x}")
diff --git a/pyboy/core/cartridge/mbc3.py b/pyboy/core/cartridge/mbc3.py
@@ -22,7 +22,7 @@ def setitem(self, address, value):
                 # lower 4 bits enables RAM, and any other value
                 # disables RAM."
                 self.rambank_enabled = False
-                logger.warning("Unexpected command for MBC3: Address: 0x%0.4x, Value: 0x%0.2x" % (address, value))
+                logger.warning(f"Unexpected command for MBC3: Address: 0x{address:04x}, Value: 0x{value:02x}")
         elif 0x2000 <= address < 0x4000:
             value &= 0b01111111
             if value == 0:
@@ -36,14 +36,14 @@ def setitem(self, address, value):
             else:
                 # NOTE: Pokemon Red/Blue will do this, but it can safely be ignored:
                 # https://github.com/pret/pokered/issues/155
-                logger.warning("RTC not present. Game tried to issue RTC command: 0x%0.4x, 0x%0.2x" % (address, value))
+                logger.warning(f"RTC not present. Game tried to issue RTC command: 0x{address:04x}, 0x{value:02x}")
         elif 0xA000 <= address < 0xC000:
             if self.rambank_enabled:
                 if self.rambank_selected <= 0x03:
                     self.rambanks[self.rambank_selected][address - 0xA000] = value
                 elif 0x08 <= self.rambank_selected <= 0x0C:
                     self.rtc.setregister(self.rambank_selected, value)
                 else:
-                    logger.error("Invalid RAM bank selected: 0x%0.2x" % self.rambank_selected)
+                    logger.error(f"Invalid RAM bank selected: 0x{self.rambank_selected:02x}")
         else:
-            logger.error("Invalid writing address: 0x%0.4x" % address)
+            logger.error("Invalid writing address: 0x{address:04x}")
diff --git a/pyboy/core/cartridge/mbc5.py b/pyboy/core/cartridge/mbc5.py
@@ -26,12 +26,11 @@ def setitem(self, address, value):
         elif 0xA000 <= address < 0xC000:
             if self.rambanks is None:
                 logger.warning(
-                    "Game tries to set value 0x%0.2x at RAM address 0x%0.4x, but RAM "
-                    "banks are not initialized. Initializing %d RAM banks as "
-                    "precaution" % (value, address, self.external_ram_count)
+                    f"Game tries to set value 0x{value:02x} at RAM address 0x{address:04x}, but RAM "
+                    f"banks are not initialized. Initializing {self.external_ram_count} RAM banks as precaution"
                 )
                 self.init_rambanks(self.external_ram_count)
             if self.rambank_enabled:
                 self.rambanks[self.rambank_selected % self.external_ram_count][address - 0xA000] = value
         else:
-            logger.error("Unexpected write to 0x%0.4x, value: 0x%0.2x" % (address, value))
+            logger.error(f"Unexpected write to 0x{address:04x}, value: 0x{value:02x}")
diff --git a/pyboy/core/cartridge/rtc.py b/pyboy/core/cartridge/rtc.py
@@ -72,11 +72,11 @@ def writecommand(self, value):
                 self.latch_rtc()
             self.latch_enabled = True
         else:
-            logger.warning("Invalid RTC command: %0.2x" % value)
+            logger.warning(f"Invalid RTC command: {value:02x}")
 
     def getregister(self, register):
         if not self.latch_enabled:
-            logger.info("RTC: Get register, but nothing is latched! 0x%0.2x" % register)
+            logger.info(f"RTC: Get register, but nothing is latched! 0x{register:02x}")
 
         if register == 0x08:
             return self.sec_latch
@@ -92,11 +92,11 @@ def getregister(self, register):
             day_carry = self.day_carry << 7
             return day_high + halt + day_carry
         else:
-            logger.warning("Invalid RTC register: %0.4x" % (register))
+            logger.warning(f"Invalid RTC register: {register:04x}")
 
     def setregister(self, register, value):
         if not self.latch_enabled:
-            logger.info("RTC: Set register, but nothing is latched! 0x%0.4x, 0x%0.2x" % (register, value))
+            logger.info(f"RTC: Set register, but nothing is latched! 0x{register:04x}, 0x{value:02x}")
 
         t = time.time() - self.timezero
         if register == 0x08:
@@ -122,4 +122,4 @@ def setregister(self, register, value):
             self.timezero -= int(t / 3600 / 24) - (day_high << 8)
             self.day_carry = day_carry
         else:
-            logger.warning("Invalid RTC register: %0.4x %0.2x" % (register, value))
+            logger.warning(f"Invalid RTC register: 0x{register:04x}, 0x{value:02x}")
diff --git a/pyboy/core/mb.py b/pyboy/core/mb.py
@@ -352,10 +352,10 @@ def getitem(self, i):
         elif i == 0xFFFF: # Interrupt Enable Register
             return self.cpu.interrupts_enabled_register
         else:
-            raise IndexError("Memory access violation. Tried to read: %s" % hex(i))
+            raise IndexError(f"Memory access violation. Tried to read: {i:04x}")
 
     def setitem(self, i, value):
-        assert 0 <= value < 0x100, "Memory write error! Can't write %s to %s" % (hex(value), hex(i))
+        assert 0 <= value < 0x100, f"Memory write error! Can't write {value:02x} to {i:04x}"
 
         if 0x0000 <= i < 0x4000: # 16kB ROM bank #0
             # Doesn't change the data. This is for MBC commands
@@ -484,7 +484,7 @@ def setitem(self, i, value):
         elif i == 0xFFFF: # Interrupt Enable Register
             self.cpu.interrupts_enabled_register = value
         else:
-            raise Exception("Memory access violation. Tried to write: %s" % hex(i))
+            raise Exception(f"Memory access violation. Tried to write: {i:04x}")
 
     def transfer_DMA(self, src):
         # http://problemkaputt.de/pandocs.htm#lcdoamdmatransfers
diff --git a/pyboy/plugins/base_plugin.py b/pyboy/plugins/base_plugin.py
@@ -69,10 +69,10 @@ def __init__(self, pyboy, mb, pyboy_argv, *args, **kwargs):
 
         scale = pyboy_argv.get("scale")
         self.scale = scale
-        logger.info("%s initialization" % self.__class__.__name__)
+        logger.info(f"{self.__class__.__name__} initialization")
 
         self._scaledresolution = (scale * COLS, scale * ROWS)
-        logger.info("Scale: x%s %s" % (self.scale, self._scaledresolution))
+        logger.info(f"Scale: x{self.scale} {self._scaledresolution}")
 
         self.enable_title = True
         if not cythonmode:
diff --git a/pyboy/pyboy.py b/pyboy/pyboy.py
@@ -158,7 +158,7 @@ def _handle_events(self, events):
             elif event == WindowEvent.RELEASE_SPEED_UP:
                 # Switch between unlimited and 1x real-time emulation speed
                 self.target_emulationspeed = int(bool(self.target_emulationspeed) ^ True)
-                logger.info("Speed limit: %s" % self.target_emulationspeed)
+                logger.info(f"Speed limit: {self.target_emulationspeed}")
             elif event == WindowEvent.STATE_SAVE:
                 with open(self.gamerom_file + ".state", "wb") as f:
                     self.mb.save_state(IntIOWrapper(f))
@@ -214,9 +214,9 @@ def _post_tick(self):
 
     def _update_window_title(self):
         avg_emu = self.avg_pre + self.avg_tick + self.avg_post
-        self.window_title = "CPU/frame: %0.2f%%" % ((self.avg_pre + self.avg_tick) / SPF * 100)
+        self.window_title = f"CPU/frame: {(self.avg_pre + self.avg_tick) / SPF * 100:0.2f}%"
         tolerance = 0.001 # 1ms. Avoid infinity and division by zero
-        self.window_title += " Emulation: x%s" % (round(SPF / avg_emu) if avg_emu > tolerance else "INF")
+        self.window_title += f" Emulation: x{round(SPF / avg_emu) if avg_emu > tolerance else 'INF'}"
         if self.paused:
             self.window_title += "[PAUSED]"
         self.window_title += self.plugin_manager.window_title()
