Merge pull request #2164 from pre-commit/py2-cleanup

asottile · web-flow · commit de177e885049 · 2021-12-20T22:03:16.000-05:00
minor py2 cleanup for sys.stderr.buffer
diff --git a/testing/resources/docker_hooks_repo/Dockerfile b/testing/resources/docker_hooks_repo/Dockerfile
@@ -1,3 +1,3 @@
-FROM cogniteev/echo
+FROM ubuntu:focal
 
 CMD ["echo", "This is overwritten by the .pre-commit-hooks.yaml 'entry'"]
diff --git a/testing/resources/docker_image_hooks_repo/.pre-commit-hooks.yaml b/testing/resources/docker_image_hooks_repo/.pre-commit-hooks.yaml
@@ -1,8 +1,8 @@
 -   id: echo-entrypoint
     name: echo (via --entrypoint)
     language: docker_image
-    entry: --entrypoint echo cogniteev/echo
+    entry: --entrypoint echo ubuntu:focal
 -   id: echo-cmd
     name: echo (via cmd)
     language: docker_image
-    entry: cogniteev/echo echo
+    entry: ubuntu:focal echo
diff --git a/tests/languages/helpers_test.py b/tests/languages/helpers_test.py
@@ -72,8 +72,8 @@ def test_basic_healthy():
 def test_failed_setup_command_does_not_unicode_error():
     script = (
         'import sys\n'
-        "getattr(sys.stderr, 'buffer', sys.stderr).write(b'\\x81\\xfe')\n"
-        'exit(1)\n'
+        "sys.stderr.buffer.write(b'\\x81\\xfe')\n"
+        'raise SystemExit(1)\n'
     )
 
     # an assertion that this does not raise `UnicodeError`

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-FROM cogniteev/echo`
	`1`	`+FROM ubuntu:focal`
`2`	`2`
`3`	`3`	`CMD ["echo", "This is overwritten by the .pre-commit-hooks.yaml 'entry'"]`