Skip to content

Commit d2a994d

Browse files
committed
fix encoding bug in zipopen
1 parent e4d533c commit d2a994d

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

pypop/trace/prvtrace.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
class PRVTrace(Trace):
5757
def _gather_metadata(self):
5858

59-
with zipopen(self._tracefile, "r") as fh:
60-
headerline = fh.readline().decode().strip()
59+
with zipopen(self._tracefile, "rt") as fh:
60+
headerline = fh.readline().strip()
6161

6262
elem = headerline.replace(":", ";", 1).split(":", 4)
6363

pypop/utils/io.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@
1414

1515

1616
def zipopen(path, mode="rt"):
17+
18+
# Default modes of open() and gzip.open() are not the same ('t' and 'b' respectively)
19+
# so ensure a consistent default of text mode
20+
if not any(x in mode for x in ('t', 'b')):
21+
mode = "{}t".format(mode)
22+
1723
try:
1824
if gzip.open(path, mode=mode).readline():
1925
return gzip.open(path, mode=mode)

0 commit comments

Comments
 (0)