From ab3da91fb6c91a9df52fff8f991570f456fd3c7a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 18 Dec 2020 11:06:49 +0000 Subject: gentoo resync : 18.12.2020 --- .../files/git-cola-3.5-py3.8-line-buffering.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch (limited to 'dev-vcs/git-cola/files') diff --git a/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch b/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch new file mode 100644 index 000000000000..4938d6a30eca --- /dev/null +++ b/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch @@ -0,0 +1,29 @@ +From ed00653d43b00b18e89c8c4d9e733ef156c02579 Mon Sep 17 00:00:00 2001 +From: Simon Peeters +Date: Mon, 18 Nov 2019 21:15:32 +0100 +Subject: [PATCH] Only use line buffering in text mode when calling Popen + +Python3.8 started complaining loudly when trying to open a stream in binary mode but with line buffering enabled. +So we should only try to set `bufsize` to `1` when we enable `text` or `universal_newlines` mode. + +see https://docs.python.org/3/library/subprocess.html#subprocess.Popen under bufsize +--- + cola/core.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/cola/core.py b/cola/core.py +index 0fabfcf3d..5ad719f05 100644 +--- a/cola/core.py ++++ b/cola/core.py +@@ -208,7 +208,10 @@ def start_command(cmd, cwd=None, add_env=None, + CREATE_NO_WINDOW = 0x08000000 + extra['creationflags'] = CREATE_NO_WINDOW + +- return subprocess.Popen(cmd, bufsize=1, stdin=stdin, stdout=stdout, ++ # Use line buffering when in text/universal_newlines mode, ++ # otherwise use the system default buffer size. ++ bufsize = 1 if universal_newlines else -1 ++ return subprocess.Popen(cmd, bufsize=bufsize, stdin=stdin, stdout=stdout, + stderr=stderr, cwd=cwd, env=env, + universal_newlines=universal_newlines, **extra) + -- cgit v1.2.3