Skip to content

Commit 6e929cc

Browse files
committed
Remove some old % style string formatting.
1 parent e1f3d4e commit 6e929cc

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
@@ -37,7 +37,7 @@ def __init__(self, frame, pid):
3737

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

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

577577
def __str__(self):
578-
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)
578+
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)
579579

580580

581581
class ResourceRequestEvent(GameEvent):
@@ -600,7 +600,7 @@ def __init__(self, frame, pid, data):
600600
self.custom_resource = self.resources[3] if len(self.resources) >= 4 else None
601601

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

605605

606606
class ResourceRequestFulfillEvent(GameEvent):

sc2reader/events/message.py

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

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

2727
def __str__(self):
2828
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)