mirror of
https://github.com/python/cpython.git
synced 2025-09-15 13:16:12 +00:00
Remove warnings generated for the suprocess module when run under -3. Required
commenting out True/False compatbility stuff, remove a use of apply(), and remove a use of buffer() (just pulled the solution used in 3.0 which is direct slicing).
This commit is contained in:
parent
0563a8ffd1
commit
03446c43ca
2 changed files with 11 additions and 9 deletions
|
@ -411,11 +411,11 @@ except:
|
|||
MAXFD = 256
|
||||
|
||||
# True/False does not exist on 2.2.0
|
||||
try:
|
||||
False
|
||||
except NameError:
|
||||
False = 0
|
||||
True = 1
|
||||
#try:
|
||||
# False
|
||||
#except NameError:
|
||||
# False = 0
|
||||
# True = 1
|
||||
|
||||
_active = []
|
||||
|
||||
|
@ -1066,7 +1066,7 @@ class Popen(object):
|
|||
os.chdir(cwd)
|
||||
|
||||
if preexec_fn:
|
||||
apply(preexec_fn)
|
||||
preexec_fn()
|
||||
|
||||
if env is None:
|
||||
os.execvp(executable, args)
|
||||
|
@ -1173,7 +1173,8 @@ class Popen(object):
|
|||
# When select has indicated that the file is writable,
|
||||
# we can write up to PIPE_BUF bytes without risk
|
||||
# blocking. POSIX defines PIPE_BUF >= 512
|
||||
bytes_written = os.write(self.stdin.fileno(), buffer(input, input_offset, 512))
|
||||
chunk = input[input_offset : input_offset + 512]
|
||||
bytes_written = os.write(self.stdin.fileno(), chunk)
|
||||
input_offset += bytes_written
|
||||
if input_offset >= len(input):
|
||||
self.stdin.close()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue