Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Find another way to shut up patch.

  • Loading branch information...
commit 905e5fddfcfb60f959a4ce3273ccc5b12eb14fa1 1 parent 5647daf
@chrisrossi chrisrossi authored
Showing with 2 additions and 5 deletions.
  1. +2 −5 acidfs/__init__.py
View
7 acidfs/__init__.py
@@ -720,7 +720,7 @@ def expect(expectation, *msg):
expect(isinstance(blob, _Blob), "Not a blob")
with _tempfile() as tmp:
shutil.copyfileobj(blob.open(), open(tmp, 'wb'))
- with _popen(['patch', tmp, '-'],
+ with _popen(['patch', '-s', tmp, '-'],
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE) as p:
@@ -973,10 +973,7 @@ def _popen(args, **kw):
yield proc
for stream in (proc.stdin, proc.stdout, proc.stderr):
if stream is not None:
- if not stream.closed:
- if stream.readable():
- stream.read()
- stream.close()
+ stream.close()
retcode = proc.wait()
if retcode != 0:
raise subprocess.CalledProcessError(retcode, repr(args))
Please sign in to comment.
Something went wrong with that request. Please try again.