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).
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index f2c91f1..935827a 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -411,11 +411,11 @@
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 @@
os.chdir(cwd)
if preexec_fn:
- apply(preexec_fn)
+ preexec_fn()
if env is None:
os.execvp(executable, args)
@@ -1173,7 +1173,8 @@
# 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()
diff --git a/Misc/NEWS b/Misc/NEWS
index 2a01e01..3285b24 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -48,8 +48,9 @@
while running under the ``-3`` flag: aifc, asyncore, bdb, bsddb,
ConfigParser, cookielib, DocXMLRPCServer, email, filecmp, fileinput, inspect,
logging, modulefinder, pdb, pickle, profile, pstats, pydoc, re, rlcompleter,
- SimpleXMLRPCServer, shelve, sqlite3, tarfile, Tkinter, test.test_support,
- textwrap, threading, tokenize, traceback, urlparse, wsgiref, xml, xmlrpclib.
+ SimpleXMLRPCServer, shelve, subprocess, sqlite3, tarfile, Tkinter,
+ test.test_support, textwrap, threading, tokenize, traceback, urlparse,
+ wsgiref, xml, xmlrpclib.
- Issue #3039: Fix tarfile.TarFileCompat.writestr() which always
raised an AttributeError.