FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Rename BlockingOSError to BlockingIOError · sysfce2/python-future@e97c807 · GitHub

/ python-future Public
forked from PythonCharmers/python-future

Commit e97c807

Browse files
edschofield
committed
Rename BlockingOSError to BlockingIOError
1 parent dded882 commit e97c807

4 files changed

Lines changed: 14 additions & 66 deletions

File tree

‎src/future/builtins/__init__.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
# Exceptions
5454
try:
55-
BlockingOSError = builtins.BlockingOSError
55+
BlockingIOError = builtins.BlockingIOError
5656
BrokenPipeError = builtins.BrokenPipeError
5757
ChildProcessError = builtins.ChildProcessError
5858
ConnectionError = builtins.ConnectionError
@@ -68,10 +68,10 @@
6868
ProcessLookupError = builtins.ProcessLookupError
6969
TimeoutError = builtins.TimeoutError
7070
except NameError:
71-
from future.types.exceptions import *
71+
from future.types.exceptions.pep3151 import *
7272
import future.types.exceptions as fte
7373
__all__ += [
74-
'BlockingOSError',
74+
'BlockingIOError',
7575
'BrokenPipeError',
7676
'ChildProcessError',
7777
'ConnectionError',

‎src/future/types/exceptions/__init__.py‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,2 @@
1-
"""
2-
Exception matching patchwork.
3-
4-
Libraries are not as fine-grained with exception classes as one would like. By
5-
using exhacktion, you can make create your own exceptions which behave as if
6-
they are superclasses of the ones raised by the library.
7-
8-
Tread with caution.
9-
"""
10-
111
from .pep3151 import *
12-
__all__ = [
13-
'BlockingOSError',
14-
'BrokenPipeError',
15-
'ChildProcessError',
16-
'ConnectionError',
17-
'ConnectionAbortedError',
18-
'ConnectionRefusedError',
19-
'ConnectionResetError',
20-
'FileExistsError',
21-
'FileNotFoundError',
22-
'InterruptedError',
23-
'IsADirectoryError',
24-
'NotADirectoryError',
25-
'PermissionError',
26-
'ProcessLookupError',
27-
'TimeoutError',
28-
]
2+

‎src/future/types/exceptions/base.py‎

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
"""
2+
Libraries are not as fine-grained with exception classes as one would like. By
3+
using this hack, you can make create your own exceptions which behave as if
4+
they are superclasses of the ones raised by the standard library.
5+
6+
Tread with caution.
7+
28
Defines the base `instance_checking_exception` creator.
39
"""
410

@@ -37,19 +43,7 @@ def wrapped(instance_checker):
3743
handling logic.
3844
"""
3945
class TemporaryClass(base_exception):
40-
# def __new__(cls, *args):
41-
# print('TemporaryClass.__new__: args are: {0}'.format(args))
42-
# if len(args) == 1 and isinstance(args[0], TemporaryClass):
43-
# unwrap_me = args[0]
44-
# err = super(TemporaryClass, cls).__new__(cls)
45-
# for attr in dir(unwrap_me):
46-
# if not attr.startswith('__'):
47-
# setattr(err, attr, getattr(unwrap_me, attr))
48-
# else:
49-
# return super(base_exception, cls).__new__(cls, *args)
50-
5146
def __init__(self, *args, **kwargs):
52-
# print('TemporaryClass.__init__: args are: {0}'.format(args))
5347
if len(args) == 1 and isinstance(args[0], TemporaryClass):
5448
unwrap_me = args[0]
5549
for attr in dir(unwrap_me):
@@ -60,35 +54,13 @@ def __init__(self, *args, **kwargs):
6054

6155
class __metaclass__(type):
6256
def __instancecheck__(cls, inst):
63-
# print('FileNotFoundError.__isinstance__: type(inst) = {0}\ninst = {1}'.format(type(inst), inst))
6457
return instance_checker(inst)
6558

6659
def __subclasscheck__(cls, classinfo):
67-
# print('In __subclasscheck__:\n\tcls = {0}\n\tclassinfo = {1}'.format(cls, classinfo))
68-
# return instance_checker(classinfo)
69-
# This hook is called during the exception handling.
70-
# Unfortunately, we would rather have exception handling call
71-
# __instancecheck__, so we have to do that ourselves. But,
72-
# that's not how it currently is. If you feel like proposing a
73-
# patch for Python, check the function
74-
# `PyErr_GivenExceptionMatches` in `Python/error.c`.
7560
value = sys.exc_info()[1]
76-
# if value is None:
77-
# print('Exception value is None!!')
78-
79-
# Double-check that the exception given actually somewhat
80-
# matches the classinfo we received. If not, people may be using
81-
# `issubclass` directly, which is of course prone to errors,
82-
# or they are raising the exception with `raise ...`
83-
# if value.__class__ != classinfo:
84-
# print('Mismatch!\nvalue: {0}\nvalue.__class__: {1}\nclassinfo: {2}'.format(
85-
# value, value.__class__, classinfo)
86-
# )
8761
return isinstance(value, cls)
8862

8963
TemporaryClass.__name__ = instance_checker.__name__
9064
TemporaryClass.__doc__ = instance_checker.__doc__
9165
return TemporaryClass
9266
return wrapped
93-
94-

‎src/future/types/exceptions/pep3151.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
a lot of under-the-hood magic to make it look like the standard library is
44
actually throwing these more specific versions instead of just OSError, OSError
55
and such.
6+
7+
Based on https://github.com/sjoerdjob/exhacktion.
68
"""
79

810
import errno
@@ -11,7 +13,7 @@
1113

1214

1315
@instance_checking_exception(OSError)
14-
def BlockingOSError(inst):
16+
def BlockingIOError(inst):
1517
"""I/O operation would block."""
1618
errnos = [errno.EAGAIN, errno.EALREADY, errno.EWOULDBLOCK,
1719
errno.EINPROGRESS]
@@ -106,7 +108,7 @@ def TimeoutError(inst):
106108
return hasattr(inst, 'errno') and inst.errno == errno.ETIMEDOUT
107109

108110
__all__ = [
109-
'BlockingOSError',
111+
'BlockingIOError',
110112
'BrokenPipeError',
111113
'ChildProcessError',
112114
'ConnectionError',

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL