summaryrefslogtreecommitdiffstats
path: root/Lib/subprocess.py
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2013-03-21 01:32:45 (GMT)
committerGregory P. Smith <greg@krypto.org>2013-03-21 01:32:45 (GMT)
commite25df59427df97c40da28ce469e1be46a2643e4a (patch)
tree2efe8b14a3b1b79adf430c971f887fa317e845c7 /Lib/subprocess.py
parent82c6b45c1421c9c7b687f8f8a53faa77d8ebbd55 (diff)
parent74b24047e3ac3000564a6e0d699bf5a5eaaddf9d (diff)
downloadcpython-e25df59427df97c40da28ce469e1be46a2643e4a.zip
cpython-e25df59427df97c40da28ce469e1be46a2643e4a.tar.gz
cpython-e25df59427df97c40da28ce469e1be46a2643e4a.tar.bz2
merge
Diffstat (limited to 'Lib/subprocess.py')
-rw-r--r--Lib/subprocess.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 20f359a..e023d85 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -108,10 +108,9 @@ If universal_newlines is true, the file objects stdout and stderr are
opened as a text files, but lines may be terminated by any of '\n',
the Unix end-of-line convention, '\r', the old Macintosh convention or
'\r\n', the Windows convention. All of these external representations
-are seen as '\n' by the Python program. Note: This feature is only
-available if Python is built with universal newline support (the
-default). Also, the newlines attribute of the file objects stdout,
-stdin and stderr are not updated by the communicate() method.
+are seen as '\n' by the Python program. Also, the newlines attribute
+of the file objects stdout, stdin and stderr are not updated by the
+communicate() method.
The startupinfo and creationflags, if given, will be passed to the
underlying CreateProcess() function. They can specify things such as