Merged revisions 80279 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80279 | ronald.oussoren | 2010-04-20 22:59:37 +0200 (Tue, 20 Apr 2010) | 3 lines

  Fix for issue 7852: the DTD for OSX Plists has changed due
  to a change in the company name for Apple.
........

diff --git a/Lib/plistlib.py b/Lib/plistlib.py
index fbba791ce57d7cae57a2c6d6056f48fcf89c2ad6..82d456aec0facefb4e4205f33450fdb53f84ef35 100644 (file)
--- a/Lib/plistlib.py
+++ b/Lib/plistlib.py
@@ -186,7 +186,7 @@ def _escape(text):
 
 PLISTHEADER = b"""\
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 """
 
 class PlistWriter(DumbXMLWriter):