diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2016-12-07 11:31:47 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-12-07 11:31:47 (GMT) |
| commit | 427f10b442bd4747262069596095cc3a8e0458e6 (patch) | |
| tree | fffa5536886689fb360c15440205cf5d7bf97475 | |
| parent | 2c5a830f2ac654e643eaa29ef60bd51977700376 (diff) | |
| parent | 606ab86c0e11eb00fc276c694bff9d7f9239d538 (diff) | |
| download | cpython-427f10b442bd4747262069596095cc3a8e0458e6.zip cpython-427f10b442bd4747262069596095cc3a8e0458e6.tar.gz cpython-427f10b442bd4747262069596095cc3a8e0458e6.tar.bz2 | |
Merge from 3.5.
| -rw-r--r-- | Lib/_pyio.py | 2 | ||||
| -rw-r--r-- | Modules/_io/_iomodule.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/_pyio.py b/Lib/_pyio.py index d0947f0..2ebfb05 100644 --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -277,7 +277,7 @@ class OpenWrapper: try: UnsupportedOperation = io.UnsupportedOperation except AttributeError: - class UnsupportedOperation(ValueError, OSError): + class UnsupportedOperation(OSError, ValueError): pass diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c index 60f8b54..f4d3cbd 100644 --- a/Modules/_io/_iomodule.c +++ b/Modules/_io/_iomodule.c @@ -683,7 +683,7 @@ PyInit__io(void) /* UnsupportedOperation inherits from ValueError and IOError */ state->unsupported_operation = PyObject_CallFunction( (PyObject *)&PyType_Type, "s(OO){}", - "UnsupportedOperation", PyExc_ValueError, PyExc_IOError); + "UnsupportedOperation", PyExc_OSError, PyExc_ValueError); if (state->unsupported_operation == NULL) goto fail; Py_INCREF(state->unsupported_operation); |