traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge from 3.5.

This commit is contained in:
Serhiy Storchaka 2016-12-07 13:31:47 +02:00
parent 2c5a830f2a 606ab86c0e
commit 427f10b442
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/_pyio.py
View File

@ -277,7 +277,7 @@ class OpenWrapper:
try: try:
UnsupportedOperation = io.UnsupportedOperation UnsupportedOperation = io.UnsupportedOperation
except AttributeError: except AttributeError:
class UnsupportedOperation(ValueError, OSError): class UnsupportedOperation(OSError, ValueError):
pass pass

2
Modules/_io/_iomodule.c
View File

@ -683,7 +683,7 @@ PyInit__io(void)
/* UnsupportedOperation inherits from ValueError and IOError */ /* UnsupportedOperation inherits from ValueError and IOError */
state->unsupported_operation = PyObject_CallFunction( state->unsupported_operation = PyObject_CallFunction(
(PyObject *)&PyType_Type, "s(OO){}", (PyObject *)&PyType_Type, "s(OO){}",
"UnsupportedOperation", PyExc_ValueError, PyExc_IOError); "UnsupportedOperation", PyExc_OSError, PyExc_ValueError);
if (state->unsupported_operation == NULL) if (state->unsupported_operation == NULL)
goto fail; goto fail;
Py_INCREF(state->unsupported_operation); Py_INCREF(state->unsupported_operation);