Skip to content

Commit 6a78531

Browse files
committed
Merge branch 'decode'
From #110
2 parents 8cd6ec1 + 561ff8f commit 6a78531

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

gitless/core.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,10 +1333,18 @@ def _stash_msg_merge(name):
13331333
'OpCb', ['apply_ok', 'apply_err', 'save', 'restore_ok'])
13341334

13351335
def stdout(p):
1336-
return p.stdout.decode(ENCODING)
1336+
try:
1337+
pstdout = p.stdout.decode(ENCODING)
1338+
except AttributeError:
1339+
pstdout = p.stdout
1340+
return pstdout
13371341

13381342
def stderr(p):
1339-
return p.stderr.decode(ENCODING)
1343+
try:
1344+
pstderr = p.stderr.decode(ENCODING)
1345+
except AttributeError:
1346+
pstderr = p.stderr
1347+
return pstderr
13401348

13411349
def walker(git_repo, target, reverse):
13421350
flags = pygit2.GIT_SORT_TOPOLOGICAL | pygit2.GIT_SORT_TIME

0 commit comments

Comments
 (0)