summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-12-07 11:31:20 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2016-12-07 11:31:20 (GMT)
commit606ab86c0e11eb00fc276c694bff9d7f9239d538 (patch)
treecf5d3b34fcee94d247e8d3e53ac2bbe5517a3882
parent5adfac2c1b7fb4f0782d097e7e0e6c5614965634 (diff)
downloadcpython-606ab86c0e11eb00fc276c694bff9d7f9239d538.zip
cpython-606ab86c0e11eb00fc276c694bff9d7f9239d538.tar.gz
cpython-606ab86c0e11eb00fc276c694bff9d7f9239d538.tar.bz2
Change order of io.UnsupportedOperation base classes.
This makes tests passing after changes by issue #5322.
-rw-r--r--Lib/_pyio.py2
-rw-r--r--Modules/_io/_iomodule.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/_pyio.py b/Lib/_pyio.py
index 0d98b74..f2fe447 100644
--- a/Lib/_pyio.py
+++ b/Lib/_pyio.py
@@ -276,7 +276,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 65c955a..e9f22af 100644
--- a/Modules/_io/_iomodule.c
+++ b/Modules/_io/_iomodule.c
@@ -654,7 +654,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);