Merge branch 'REL_2_5' into REL_2_6

funny-falcon · funny-falcon · commit f281022f9121 · 2022-11-25T06:42:29.000+03:00
diff --git a/tests/helpers/ptrack_helpers.py b/tests/helpers/ptrack_helpers.py
@@ -1996,7 +1996,8 @@ def __init__(self, cmd, env, attach=False):
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
             bufsize=0,
-            universal_newlines=True
+            text=True,
+            errors='replace',
         )
         self.gdb_pid = self.proc.pid
 

Original file line number	Diff line number	Diff line change
`@@ -1996,7 +1996,8 @@ def __init__(self, cmd, env, attach=False):`
`1996`	`1996`	`stdout=subprocess.PIPE,`
`1997`	`1997`	`stderr=subprocess.STDOUT,`
`1998`	`1998`	`bufsize=0,`
`1999`		`- universal_newlines=True`
	`1999`	`+ text=True,`
	`2000`	`+ errors='replace',`
`2000`	`2001`	`)`
`2001`	`2002`	`self.gdb_pid = self.proc.pid`
`2002`	`2003`