From: Ned Deily <nad@acm.org>
Date: Mon, 13 Jan 2014 19:34:19 +0000 (-0800)
Subject: Issue #20229: Avoid plistlib deprecation warning in platform.mac_ver().
X-Git-Tag: v3.4.0b3~160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=936dfae2e22b5b58d01416ddf47218c20bfde5e6;p=thirdparty%2FPython%2Fcpython.git

Issue #20229: Avoid plistlib deprecation warning in platform.mac_ver().
---

diff --git a/Lib/platform.py b/Lib/platform.py
index 48b81ac7e50a..11b501e7d732 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 d6232d3d741e..50765c95b6c5 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
 ----