summaryrefslogtreecommitdiffstats
path: root/Lib/platform.py
diff options
context:
space:
mode:
authorSkip Montanaro <skip@pobox.com>2011-03-19 18:03:33 (GMT)
committerSkip Montanaro <skip@pobox.com>2011-03-19 18:03:33 (GMT)
commit482e7e061b110d4c2a5b8d39d13444370baf112b (patch)
treef93f8edc97101e5240a03aeb002b6633b0509abf /Lib/platform.py
parentb61efd0a68a392e22e5f4a46e03b250977e6236b (diff)
parent1679f4daa1b324bba87d952bc7da2c3e37f315fd (diff)
downloadcpython-482e7e061b110d4c2a5b8d39d13444370baf112b.zip
cpython-482e7e061b110d4c2a5b8d39d13444370baf112b.tar.gz
cpython-482e7e061b110d4c2a5b8d39d13444370baf112b.tar.bz2
merge from upstream
Diffstat (limited to 'Lib/platform.py')
-rwxr-xr-xLib/platform.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/platform.py b/Lib/platform.py
index fb65b4b..75bc5f3 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -357,7 +357,7 @@ def dist(distname='',version='',id='',
supported_dists=supported_dists,
full_distribution_name=0)
-def popen(cmd, mode='r', bufsize=None):
+def popen(cmd, mode='r', bufsize=-1):
""" Portable popen() interface.
"""