Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge from 3.5

This commit is contained in:
Steve Dower 2015-08-10 21:01:00 -07:00
parent 76ba13bf71 cae101f5ec
commit 5b9cd7fa2e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -152,3 +152,4 @@ b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.3
7a088af5615bf04024e9912068f4bd8f43ed3917 v3.5.0b2
0035fcd9b9243ae52c2e830204fd9c1f7d528534 v3.5.0b3
c0d64105463581f85d0e368e8d6e59b7fd8f12b1 v3.5.0b4
1a58b1227501e046eee13d90f113417b60843301 v3.5.0rc1

2
Lib/platform.py
View File

@ -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')