mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

bpo-30022: Get rid of using EnvironmentError and IOError (except test… (#1051)

Browse source
This commit is contained in:
Serhiy Storchaka 2017-04-16 10:46:38 +03:00 • committed by GitHub
parent fdbd01151d
commit 55fe1ae970
36 changed files with 1538 additions and 1538 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/mimetypes.py
View file

@ -245,7 +245,7 @@ class MimeTypes:
while True:
try:
ctype = _winreg.EnumKey(mimedb, i)
except EnvironmentError:
except OSError:
break
else:
if '\0' not in ctype:
@ -259,13 +259,13 @@ class MimeTypes:
# Only check file extensions
if not subkeyname.startswith("."):
continue
# raises EnvironmentError if no 'Content Type' value
# raises OSError if no 'Content Type' value
mimetype, datatype = _winreg.QueryValueEx(
subkey, 'Content Type')
if datatype != _winreg.REG_SZ:
continue
self.add_type(mimetype, subkeyname, strict)
except EnvironmentError:
except OSError:
continue
def guess_type(url, strict=True):