reverted f-Strings back to format()

mx0c · Dec 26, 2020 · 775f92a · 775f92a
1 parent 73f1c33
commit 775f92a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/classes/Dashboard.py b/classes/Dashboard.py
@@ -18,7 +18,7 @@ def update(self):
         self.drawText("MARIO", 50, 20, 15)
         self.drawText(self.pointString(), 50, 37, 15)
 
-        self.drawText(f"@x{self.coinString()}", 225, 37, 15)
+        self.drawText("@x{}".format(self.coinString()), 225, 37, 15)
 
         self.drawText("WORLD", 380, 20, 15)
         self.drawText(str(self.levelName), 395, 37, 15)
@@ -43,10 +43,10 @@ def drawText(self, text, x, y, size):
                 x += size
 
     def coinString(self):
-        return f"{self.coins:02d}"
+        return "{:02d}".format(self.coins)
 
     def pointString(self):
-        return f"{self.points:06d}"
+        return "{:06d}".format(self.points)
 
     def timeString(self):
-        return f"{self.time:03d}"
+        return "{:03d}".format(self.time)
diff --git a/classes/Level.py b/classes/Level.py
@@ -23,7 +23,7 @@ def __init__(self, screen, sound, dashboard):
         self.entityList = []
 
     def loadLevel(self, levelname):
-        with open(f"./levels/{levelname}.json") as jsonData:
+        with open("./levels/{}.json".format(levelname)) as jsonData:
             data = json.load(jsonData)
             self.loadLayers(data)
             self.loadObjects(data)
@@ -47,17 +47,17 @@ def loadLayers(self, data):
         for x in range(*data["level"]["layers"]["sky"]["x"]):
             layers.append(
                 (
-                    [
-                        Tile(self.sprites.spriteCollection.get("sky"), None)
-                        for y in range(*data["level"]["layers"]["sky"]["y"])
-                    ]
-                    + [
-                        Tile(
-                            self.sprites.spriteCollection.get("ground"),
-                            pygame.Rect(x * 32, (y - 1) * 32, 32, 32),
-                        )
-                        for y in range(*data["level"]["layers"]["ground"]["y"])
-                    ]
+                        [
+                            Tile(self.sprites.spriteCollection.get("sky"), None)
+                            for y in range(*data["level"]["layers"]["sky"]["y"])
+                        ]
+                        + [
+                            Tile(
+                                self.sprites.spriteCollection.get("ground"),
+                                pygame.Rect(x * 32, (y - 1) * 32, 32, 32),
+                            )
+                            for y in range(*data["level"]["layers"]["ground"]["y"])
+                        ]
                 )
             )
         self.level = list(map(list, zip(*layers)))
@@ -105,7 +105,7 @@ def addCloudSprite(self, x, y):
             for yOff in range(0, 2):
                 for xOff in range(0, 3):
                     self.level[y + yOff][x + xOff] = Tile(
-                        self.sprites.spriteCollection.get( f"cloud{yOff + 1}_{xOff + 1}"), None,)
+                        self.sprites.spriteCollection.get("cloud{}_{}".format(yOff + 1, xOff + 1)), None, )
         except IndexError:
             return
 

diff --git a/main.py b/main.py
@@ -26,7 +26,7 @@ def main():
     clock = pygame.time.Clock()
 
     while not mario.restart:
-        pygame.display.set_caption(f"Super Mario running with {int(clock.get_fps()):d} FPS")
+        pygame.display.set_caption("Super Mario running with {:d} FPS".format(int(clock.get_fps())))
         if mario.pause:
             mario.pauseObj.update()
         else: