Skip to content

Commit 72da6ae

Browse files
committed
Remove some old % style string formatting.
1 parent 2b35c07 commit 72da6ae

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

sc2reader/decoders.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,6 @@ def read_struct(self, datatype=None):
374374
data = self.read_vint()
375375

376376
else:
377-
raise TypeError("Unknown Data Structure: '%s'" % datatype)
377+
raise TypeError("Unknown Data Structure: '{0}'".format(datatype))
378378

379379
return data

sc2reader/events/game.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def __init__(self, frame, pid):
3838

3939
def _str_prefix(self):
4040
player_name = self.player.name if getattr(self, 'pid', 16) != 16 else "Global"
41-
return "%s\t%-15s " % (Length(seconds=int(self.frame/16)), player_name)
41+
return "{0}\t{1:<15} ".format(Length(seconds=int(self.frame / 16)), player_name)
4242

4343
def __str__(self):
4444
return self._str_prefix() + self.name
@@ -547,7 +547,7 @@ def __init__(self, frame, pid, data):
547547
self.custom_resource = self.resources[3] if len(self.resources) >= 4 else None
548548

549549
def __str__(self):
550-
return self._str_prefix() + " transfer {0} minerals, {1} gas, {2} terrazine, and {3} custom to {4}" % (self.minerals, self.vespene, self.terrazine, self.custom, self.reciever)
550+
return self._str_prefix() + " transfer {0} minerals, {1} gas, {2} terrazine, and {3} custom to {4}".format(self.minerals, self.vespene, self.terrazine, self.custom, self.recipient)
551551

552552

553553
class ResourceRequestEvent(GameEvent):
@@ -573,7 +573,7 @@ def __init__(self, frame, pid, data):
573573
self.custom_resource = self.resources[3] if len(self.resources) >= 4 else None
574574

575575
def __str__(self):
576-
return self._str_prefix() + " requests {0} minerals, {1} gas, {2} terrazine, and {3} custom" % (self.minerals, self.vespene, self.terrazine, self.custom)
576+
return self._str_prefix() + " requests {0} minerals, {1} gas, {2} terrazine, and {3} custom".format(self.minerals, self.vespene, self.terrazine, self.custom)
577577

578578

579579
class ResourceRequestFulfillEvent(GameEvent):

sc2reader/events/message.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def __init__(self, frame, pid):
2626

2727
def _str_prefix(self):
2828
player_name = self.player.name if getattr(self, 'pid', 16) != 16 else "Global"
29-
return "%s\t%-15s " % (Length(seconds=int(self.frame/16)), player_name)
29+
return "{0}\t{1:<15} ".format(Length(seconds=int(self.frame / 16)), player_name)
3030

3131
def __str__(self):
3232
return self._str_prefix() + self.name

sc2reader/objects.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def __repr__(self):
8282
return str(self)
8383

8484
def __str__(self):
85-
return "[%s] %s: %s" % (self.player, self.name, self.value)
85+
return "[{0}] {1}: {2}".format(self.player, self.name, self.value)
8686

8787

8888
class Entity(object):

0 commit comments

Comments
 (0)