summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2013-03-21 01:32:22 (GMT)
committerGregory P. Smith <greg@krypto.org>2013-03-21 01:32:22 (GMT)
commit74b24047e3ac3000564a6e0d699bf5a5eaaddf9d (patch)
treebf7d6d49ea8587b3e5071964de8db45d541e5c9f /Lib
parentf1a40b4ec5bd25411189e33de1cdabdc6780cd8c (diff)
parent1f8a40b81d359c66b6b67dd0f532a655cf490b68 (diff)
downloadcpython-74b24047e3ac3000564a6e0d699bf5a5eaaddf9d.zip
cpython-74b24047e3ac3000564a6e0d699bf5a5eaaddf9d.tar.gz
cpython-74b24047e3ac3000564a6e0d699bf5a5eaaddf9d.tar.bz2
merge
Diffstat (limited to 'Lib')
-rw-r--r--Lib/subprocess.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index e01cbd7..773f3e8 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