changeset: 105510:4a610bc8577b branch: 3.5 parent: 105505:1f31bf3f76f5 user: Serhiy Storchaka date: Wed Dec 07 13:31:20 2016 +0200 files: Lib/_pyio.py Modules/_io/_iomodule.c description: Change order of io.UnsupportedOperation base classes. This makes tests passing after changes by issue #5322. diff -r 1f31bf3f76f5 -r 4a610bc8577b Lib/_pyio.py --- a/Lib/_pyio.py Fri Dec 02 08:42:43 2016 +0200 +++ b/Lib/_pyio.py Wed Dec 07 13:31:20 2016 +0200 @@ -276,7 +276,7 @@ try: UnsupportedOperation = io.UnsupportedOperation except AttributeError: - class UnsupportedOperation(ValueError, OSError): + class UnsupportedOperation(OSError, ValueError): pass diff -r 1f31bf3f76f5 -r 4a610bc8577b Modules/_io/_iomodule.c --- a/Modules/_io/_iomodule.c Fri Dec 02 08:42:43 2016 +0200 +++ b/Modules/_io/_iomodule.c Wed Dec 07 13:31:20 2016 +0200 @@ -654,7 +654,7 @@ /* 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);