Skip to content

Fix some non-python 3 things #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dsjoerg merged 3 commits into from
Jun 10, 2016
Merged

Fix some non-python 3 things #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
189dcea
Fix some non-python 3 things
DasFranck May 21, 2016
5dbe62b
Adding StringIO import for Python3
DasFranck May 21, 2016
504fd5c
Merge branch 'upstream' into upstream
DasFranck Jun 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion sc2reader/engine/plugins/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ def handleAbilityEvent(self, event, replay):
event.logger.error(replay.filename)
event.logger.error("Release String: "+replay.release_string)
for player in replay.players:
event.logger.error("\t"+unicode(player).encode('ascii', 'ignore'))
try:
event.logger.error("\t"+unicode(player).encode('ascii', 'ignore'))
except:
event.logger.error("\t"+player.__str__())

self.logger.error("{0}\t{1}\tMissing ability {2:X} from {3}".format(event.frame, event.player.name, event.ability_id, replay.datapack.__class__.__name__))

Expand Down
12 changes: 9 additions & 3 deletions sc2reader/engine/plugins/creeptracker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import, print_function, unicode_literals, division

from sets import Set
try:
from sets import Set
except ImportError:
Set = set
from PIL.Image import open as PIL_open
from PIL.Image import ANTIALIAS
from StringIO import StringIO
from PIL.Image import ANTIALIAS
try:
from StringIO import StringIO
except ImportError:
from io import StringIO
from collections import defaultdict
from itertools import tee

Expand Down