commit 55fe1ae9708d81b902b6fe8f6590e2a24b1bd4b0
author Serhiy Storchaka <storchaka@gmail.com> Sun Apr 16 10:46:38 2017 +0300
committer GitHub <noreply@github.com> Sun Apr 16 10:46:38 2017 +0300
tree c1b3aacf87240d393666321d49a5abde3e1d601f
parent fdbd01151dbd5feea3e4c0316d102db3d2a2a412

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

Lib/mimetypes.py

diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index 9a88680..3d68694 100644
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -245,7 +245,7 @@
             while True:
                 try:
                     ctype = _winreg.EnumKey(mimedb, i)
-                except EnvironmentError:
+                except OSError:
                     break
                 else:
                     if '\0' not in ctype:
@@ -259,13 +259,13 @@
                         # 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):