diff options
| author | Brian Curtin <brian.curtin@gmail.com> | 2010-10-21 14:48:22 +0000 |
|---|---|---|
| committer | Brian Curtin <brian.curtin@gmail.com> | 2010-10-21 14:48:22 +0000 |
| commit | 29f244d0ee511b03862a0b79f8dbd705edb265eb (patch) | |
| tree | caed176f1a2d577302ef7389d6a685db96c187c9 | |
| parent | fd90fd166813c20d0e0c918731cdcc06c79c8af3 (diff) | |
| download | cpython-29f244d0ee511b03862a0b79f8dbd705edb265eb.tar.gz | |
Merged revisions 85774 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r85774 | brian.curtin | 2010-10-21 09:11:48 -0500 (Thu, 21 Oct 2010) | 7 lines
Fix #10162: Add try/except around _winreg.OpenKey for keys that are
unreadable by all users, e.g., Flash, Silverlight, and Java keys were
causing errors.
We don't currently have a way to grant/deny permissions for a key
via winreg so there are no tests for this.
........
| -rw-r--r-- | Lib/mimetypes.py | 25 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 16 insertions, 12 deletions
diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py index 816f6cdcde..4c054c961c 100644 --- a/Lib/mimetypes.py +++ b/Lib/mimetypes.py @@ -257,18 +257,19 @@ class MimeTypes: with _winreg.OpenKey(_winreg.HKEY_CLASSES_ROOT, r'MIME\Database\Content Type') as mimedb: for ctype in enum_types(mimedb): - with _winreg.OpenKey(mimedb, ctype) as key: - try: - suffix, datatype = _winreg.QueryValueEx(key, 'Extension') - except EnvironmentError: - continue - if datatype != _winreg.REG_SZ: - continue - try: - suffix = suffix.encode(default_encoding) # omit in 3.x! - except UnicodeEncodeError: - continue - self.add_type(ctype, suffix, strict) + try: + with _winreg.OpenKey(mimedb, ctype) as key: + suffix, datatype = _winreg.QueryValueEx(key, + 'Extension') + except EnvironmentError: + continue + if datatype != _winreg.REG_SZ: + continue + try: + suffix = suffix.encode(default_encoding) # omit in 3.x! + except UnicodeEncodeError: + continue + self.add_type(ctype, suffix, strict) def guess_type(url, strict=True): @@ -60,6 +60,9 @@ Core and Builtins Library ------- +- Issue #10163: Skip unreadable registry keys during mimetypes + initialization. + - Issue #5117: Fixed root directory related issue on posixpath.relpath() and ntpath.relpath(). |