From bdcf62d0ebf15112887b4210779317a2d3819a4b Mon Sep 17 00:00:00 2001 From: Snaipe Date: Sat, 16 Jan 2016 21:36:20 +0100 Subject: [PATCH] Removed debug logging on cram patch --- .cmake/cram-osx.patch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.cmake/cram-osx.patch b/.cmake/cram-osx.patch index fb77c16..83baa41 100644 --- a/.cmake/cram-osx.patch +++ b/.cmake/cram-osx.patch @@ -19,18 +19,16 @@ index 20c4681..3b9f144 100755 preexec_fn=makeresetsigpipe(), close_fds=os.name == 'posix') salt = 'CRAM%s' % time.time() -@@ -199,7 +199,9 @@ def test(path, shell, indent=2): +@@ -199,7 +199,7 @@ def test(path, shell, indent=2): after.setdefault(pos, []).append(line) stdin.append('echo "\n%s %s $?"\n' % (salt, i + 1)) - output = p.communicate(input=''.join(stdin))[0] -+ print(f.encoding) -+ print(sys.stdout.encoding) + output = p.communicate(input=''.join(stdin).encode('utf-8'))[0].decode('utf-8') if p.returncode == 80: return (refout, None, []) -@@ -336,7 +338,7 @@ def run(paths, tmpdir, shell, quiet=False, verbose=False, patchcmd=None, +@@ -336,7 +336,7 @@ def run(paths, tmpdir, shell, quiet=False, verbose=False, patchcmd=None, log('!', 'failed\n', verbose) if not quiet: log('\n', None, verbose)