diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/subprocess.py | 6 | ||||
| -rw-r--r-- | Lib/test/test_subprocess.py | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py index d9c76d8..8df1034 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -883,8 +883,6 @@ class Popen(object): if self.stdin: if input is not None: - if isinstance(input, str): - input = input.encode() self.stdin.write(input) self.stdin.close() @@ -1129,10 +1127,6 @@ class Popen(object): def _communicate(self, input): - if self.stdin: - if isinstance(input, str): # Unicode - input = input.encode("utf-8") # XXX What else? - input = bytes(input) read_set = [] write_set = [] stdout = None # Return diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index 71ae0db..fe916c2 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -302,7 +302,7 @@ class ProcessTestCase(unittest.TestCase): stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - (stdout, stderr) = p.communicate("banana") + (stdout, stderr) = p.communicate(b"banana") self.assertEqual(stdout, b"banana") self.assertEqual(remove_stderr_debug_decorations(stderr), b"pineapple") @@ -420,7 +420,7 @@ class ProcessTestCase(unittest.TestCase): stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - data = p.communicate("lime")[0] + data = p.communicate(b"lime")[0] self.assertEqual(data, b"lime") |