Rename BlockingOSError to BlockingIOError

Author: edschofield

src/future/builtins/__init__.py

@@ -52,7 +52,7 @@
 
 # Exceptions
 try:
-    BlockingOSError = builtins.BlockingOSError
+    BlockingIOError = builtins.BlockingIOError
     BrokenPipeError = builtins.BrokenPipeError
     ChildProcessError = builtins.ChildProcessError
     ConnectionError = builtins.ConnectionError
@@ -68,10 +68,10 @@
     ProcessLookupError = builtins.ProcessLookupError
     TimeoutError = builtins.TimeoutError
 except NameError:
-    from future.types.exceptions import *
+    from future.types.exceptions.pep3151 import *
     import future.types.exceptions as fte
     __all__ += [
-        'BlockingOSError',
+        'BlockingIOError',
         'BrokenPipeError',
         'ChildProcessError',
         'ConnectionError',

src/future/types/exceptions/__init__.py

@@ -1,28 +1,2 @@
-"""
-Exception matching patchwork.
-
-Libraries are not as fine-grained with exception classes as one would like. By
-using exhacktion, you can make create your own exceptions which behave as if
-they are superclasses of the ones raised by the library.
-
-Tread with caution.
-"""
-
 from .pep3151 import *
-__all__ = [
-    'BlockingOSError',
-    'BrokenPipeError',
-    'ChildProcessError',
-    'ConnectionError',
-    'ConnectionAbortedError',
-    'ConnectionRefusedError',
-    'ConnectionResetError',
-    'FileExistsError',
-    'FileNotFoundError',
-    'InterruptedError',
-    'IsADirectoryError',
-    'NotADirectoryError',
-    'PermissionError',
-    'ProcessLookupError',
-    'TimeoutError',
-]
+

src/future/types/exceptions/base.py

@@ -1,4 +1,10 @@
 """
+Libraries are not as fine-grained with exception classes as one would like. By
+using this hack, you can make create your own exceptions which behave as if
+they are superclasses of the ones raised by the standard library.
+
+Tread with caution.
+
 Defines the base `instance_checking_exception` creator.
 """
 
@@ -37,19 +43,7 @@ def wrapped(instance_checker):
                 handling logic.
         """
         class TemporaryClass(base_exception):
-            # def __new__(cls, *args):
-            #     print('TemporaryClass.__new__: args are: {0}'.format(args))
-            #     if len(args) == 1 and isinstance(args[0], TemporaryClass):
-            #         unwrap_me = args[0]
-            #         err = super(TemporaryClass, cls).__new__(cls)
-            #         for attr in dir(unwrap_me):
-            #             if not attr.startswith('__'):
-            #                 setattr(err, attr, getattr(unwrap_me, attr))
-            #     else:
-            #         return super(base_exception, cls).__new__(cls, *args) 
-        
             def __init__(self, *args, **kwargs):
-                # print('TemporaryClass.__init__: args are: {0}'.format(args))
                 if len(args) == 1 and isinstance(args[0], TemporaryClass):
                     unwrap_me = args[0]
                     for attr in dir(unwrap_me):
@@ -60,35 +54,13 @@ def __init__(self, *args, **kwargs):
 
             class __metaclass__(type):
                 def __instancecheck__(cls, inst):
-                    # print('FileNotFoundError.__isinstance__: type(inst) = {0}\ninst = {1}'.format(type(inst), inst))
                     return instance_checker(inst)
 
                 def __subclasscheck__(cls, classinfo):
-                    # print('In __subclasscheck__:\n\tcls = {0}\n\tclassinfo = {1}'.format(cls, classinfo))
-                    # return instance_checker(classinfo)
-                    # This hook is called during the exception handling.
-                    # Unfortunately, we would rather have exception handling call
-                    # __instancecheck__, so we have to do that ourselves. But,
-                    # that's not how it currently is.  If you feel like proposing a
-                    # patch for Python, check the function
-                    # `PyErr_GivenExceptionMatches` in `Python/error.c`.
                     value = sys.exc_info()[1]
-                    # if value is None:
-                    #     print('Exception value is None!!')
-
-                    # Double-check that the exception given actually somewhat
-                    # matches the classinfo we received. If not, people may be using
-                    # `issubclass` directly, which is of course prone to errors,
-                    # or they are raising the exception with `raise ...`
-                    # if value.__class__ != classinfo:
-                    #     print('Mismatch!\nvalue: {0}\nvalue.__class__: {1}\nclassinfo: {2}'.format(
-                    #         value, value.__class__, classinfo)
-                    #     )
                     return isinstance(value, cls)
 
         TemporaryClass.__name__ = instance_checker.__name__
         TemporaryClass.__doc__ = instance_checker.__doc__
         return TemporaryClass
     return wrapped
-
-

src/future/types/exceptions/pep3151.py

@@ -3,6 +3,8 @@
 a lot of under-the-hood magic to make it look like the standard library is
 actually throwing these more specific versions instead of just OSError, OSError
 and such.
+
+Based on https://github.com/sjoerdjob/exhacktion.
 """
 
 import errno
@@ -11,7 +13,7 @@
 
 
 @instance_checking_exception(OSError)
-def BlockingOSError(inst):
+def BlockingIOError(inst):
     """I/O operation would block."""
     errnos = [errno.EAGAIN, errno.EALREADY, errno.EWOULDBLOCK,
               errno.EINPROGRESS]
@@ -106,7 +108,7 @@ def TimeoutError(inst):
     return hasattr(inst, 'errno') and inst.errno == errno.ETIMEDOUT
 
 __all__ = [
-    'BlockingOSError',
+    'BlockingIOError',
     'BrokenPipeError',
     'ChildProcessError',
     'ConnectionError',