diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-08-11 04:01:00 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-08-11 04:01:00 (GMT) |
| commit | 5b9cd7fa2e4b73bf97a1b28c3f3a7b15c9302941 (patch) | |
| tree | 4efcda8b5fc5a74db0343549d7a611404182d651 | |
| parent | 76ba13bf71ac9221baa77a9aa635bd29ceab36c4 (diff) | |
| parent | cae101f5ecd8fee38a37ce8fa46c141cd8a522ef (diff) | |
| download | cpython-5b9cd7fa2e4b73bf97a1b28c3f3a7b15c9302941.zip cpython-5b9cd7fa2e4b73bf97a1b28c3f3a7b15c9302941.tar.gz cpython-5b9cd7fa2e4b73bf97a1b28c3f3a7b15c9302941.tar.bz2 | |
Merge from 3.5
| -rw-r--r-- | .hgtags | 1 | ||||
| -rwxr-xr-x | Lib/platform.py | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -152,3 +152,4 @@ b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.3 7a088af5615bf04024e9912068f4bd8f43ed3917 v3.5.0b2 0035fcd9b9243ae52c2e830204fd9c1f7d528534 v3.5.0b3 c0d64105463581f85d0e368e8d6e59b7fd8f12b1 v3.5.0b4 +1a58b1227501e046eee13d90f113417b60843301 v3.5.0rc1 diff --git a/Lib/platform.py b/Lib/platform.py index 6345184..9096696 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -440,7 +440,7 @@ def _syscmd_ver(system='', release='', version='', # Try some common cmd strings for cmd in ('ver', 'command /c ver', 'cmd /c ver'): try: - pipe = popen(cmd) + pipe = os.popen(cmd) info = pipe.read() if pipe.close(): raise OSError('command failed') |