Skip to content

Commit 0354cc7

Browse files
committed
Fix the build.
1 parent 0249d0f commit 0354cc7

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ language: python
22
python:
33
- 2.6
44
- 2.7
5+
- 3.2
6+
- 3.3
57
- pypy
68
install:
79
- python setup.py install

sc2reader/engine/plugins/apm.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22
from __future__ import absolute_import, print_function, unicode_literals, division
33

4-
from collections import Counter
4+
from collections import defaultdict
55

66

77
class APMTracker(object):
@@ -18,13 +18,13 @@ class APMTracker(object):
1818

1919
def handleInitGame(self, event, replay):
2020
for player in replay.players:
21-
player.apm = Counter()
22-
player.aps = Counter()
21+
player.apm = defaultdict(int)
22+
player.aps = defaultdict(int)
2323
player.seconds_played = replay.length.seconds
2424

2525
def handlePlayerActionEvent(self, event, replay):
2626
event.player.aps[event.second] += 1
27-
event.player.apm[event.second/60] += 1
27+
event.player.apm[int(event.second/60)] += 1
2828

2929
def handlePlayerLeaveEvent(self, event, replay):
3030
event.player.seconds_played = event.second

sc2reader/factories/plugins/replay.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def APMTracker(replay):
108108
for event in player.events:
109109
if event.name == 'SelectionEvent' or 'AbilityEvent' in event.name or 'Hotkey' in event.name:
110110
player.aps[event.second] += 1
111-
player.apm[event.second/60] += 1
111+
player.apm[int(event.second/60)] += 1
112112

113113
elif event.name == 'PlayerLeaveEvent':
114114
seconds_played = event.second

sc2reader/resources.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@ def __init__(self, summary_file, filename=None, lang='enUS', **options):
739739
self.end_time = datetime.utcfromtimestamp(self.parts[0][8])
740740
self.game_speed = LOBBY_PROPERTIES[0xBB8][1][self.parts[0][0][1]]
741741
self.game_length = utils.Length(seconds=self.parts[0][7])
742-
self.real_length = utils.Length(seconds=self.parts[0][7]/GAME_SPEED_FACTOR[self.game_speed])
742+
self.real_length = utils.Length(seconds=int(self.parts[0][7]/GAME_SPEED_FACTOR[self.game_speed]))
743743
self.start_time = datetime.utcfromtimestamp(self.parts[0][8] - self.real_length.seconds)
744744

745745
self.load_translations()
@@ -960,7 +960,7 @@ def load_player_stats(self):
960960
self.build_orders[pindex].append(BuildEntry(
961961
supply=command[0],
962962
total_supply=command[1] & 0xff,
963-
time=(command[2] >> 8) / 16,
963+
time=int((command[2] >> 8) / 16),
964964
order=stat_name,
965965
build_index=command[1] >> 16
966966
))
@@ -1043,7 +1043,7 @@ def load_players(self):
10431043
# Economic Breakdown Tab
10441044
if isinstance(player.income_graph, Graph):
10451045
values = player.income_graph.values
1046-
player.resource_collection_rate = sum(values)/len(values)
1046+
player.resource_collection_rate = int(sum(values)/len(values))
10471047
else:
10481048
# In old s2gs files the field with this name was actually a number not a graph
10491049
player.resource_collection_rate = player.income_graph

0 commit comments

Comments
 (0)