summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2014-01-13 19:34:19 (GMT)
committerNed Deily <nad@acm.org>2014-01-13 19:34:19 (GMT)
commit936dfae2e22b5b58d01416ddf47218c20bfde5e6 (patch)
tree6e591cbc28257ff0fc141d77b897dd3db05a7ab7
parent75ff6d284a2c68eb752997cd05a1bdac4187b355 (diff)
downloadcpython-936dfae2e22b5b58d01416ddf47218c20bfde5e6.zip
cpython-936dfae2e22b5b58d01416ddf47218c20bfde5e6.tar.gz
cpython-936dfae2e22b5b58d01416ddf47218c20bfde5e6.tar.bz2
Issue #20229: Avoid plistlib deprecation warning in platform.mac_ver().
-rwxr-xr-xLib/platform.py3
-rw-r--r--Misc/NEWS2
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/platform.py b/Lib/platform.py
index 48b81ac..11b501e 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -649,7 +649,8 @@ def _mac_ver_xml():
except ImportError:
return None
- pl = plistlib.readPlist(fn)
+ with open(fn, 'rb') as f:
+ pl = plistlib.load(f)
release = pl['ProductVersion']
versioninfo = ('', '', '')
machine = os.uname().machine
diff --git a/Misc/NEWS b/Misc/NEWS
index d6232d3..50765c9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -65,6 +65,8 @@ Library
- Issue #20072: Fixed multiple errors in tkinter with wantobjects is False.
+- Issue #20229: Avoid plistlib deprecation warning in platform.mac_ver().
+
IDLE
----