Skip to content

Commit

Permalink
Merge pull request #3159 from jxltom/continue-to-fix-3102
Browse files Browse the repository at this point in the history
Continue to fix cannot concatenate str and type issue during locking
  • Loading branch information
techalchemy authored Nov 4, 2018
2 parents 66d4999 + 563e14e commit 0ee6826
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pipenv/vendor/delegator.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def _pexpect_out(self):
if self.subprocess.before:
result += self.subprocess.before

if self.subprocess.after and self.subprocess.after is not pexpect.EOF:
if self.subprocess.after and self.subprocess.after not in (pexpect.EOF, pexpect.TIMEOUT):
try:
result += self.subprocess.after
except (pexpect.EOF, pexpect.TIMEOUT):
Expand Down

0 comments on commit 0ee6826

Please sign in to comment.