[Python-checkins] cpython (merge 3.5 -> default): Merge from 3.5

[steve.dower]

https://hg.python.org/cpython/rev/a411062ba778
changeset:   97359:a411062ba778
parent:      97351:8c55fb5a11d8
parent:      97358:7cfe20a6395d
user:        Steve Dower <steve.dower at microsoft.com>
date:        Mon Aug 10 21:01:00 2015 -0700
summary:
  Merge from 3.5

files:
  .hgtags         |  1 +
  Lib/platform.py |  2 +-
  2 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -152,3 +152,4 @@
 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
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -440,7 +440,7 @@
     # 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')

-- 
Repository URL: https://hg.python.org/cpython