diff options
| author | Andrew Svetlov <andrew.svetlov@gmail.com> | 2014-03-31 22:14:27 (GMT) |
|---|---|---|
| committer | Andrew Svetlov <andrew.svetlov@gmail.com> | 2014-03-31 22:14:27 (GMT) |
| commit | d6ee27895adbd7cf66f8dd1591ecced7cc8d70fc (patch) | |
| tree | 517922418de871dc1088b9d6cffc62eadbf3ab80 /Doc/tutorial | |
| parent | a7906dd2d9fa19b9722d81e8d53fcc855bc8f8c0 (diff) | |
| parent | 08af00047bb9266bfb6e1cfc539affd130b47170 (diff) | |
| download | cpython-d6ee27895adbd7cf66f8dd1591ecced7cc8d70fc.zip cpython-d6ee27895adbd7cf66f8dd1591ecced7cc8d70fc.tar.gz cpython-d6ee27895adbd7cf66f8dd1591ecced7cc8d70fc.tar.bz2 | |
Merge 3.4: Get rid of deprecated IOError in the doc
Diffstat (limited to 'Doc/tutorial')
| -rw-r--r-- | Doc/tutorial/controlflow.rst | 2 | ||||
| -rw-r--r-- | Doc/tutorial/errors.rst | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst index 97aea4f..ef50731 100644 --- a/Doc/tutorial/controlflow.rst +++ b/Doc/tutorial/controlflow.rst @@ -370,7 +370,7 @@ defined to allow. For example:: return False retries = retries - 1 if retries < 0: - raise IOError('uncooperative user') + raise OSError('uncooperative user') print(complaint) This function can be called in several ways: diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst index 4282151..d048ae9 100644 --- a/Doc/tutorial/errors.rst +++ b/Doc/tutorial/errors.rst @@ -131,8 +131,8 @@ the exception (allowing a caller to handle the exception as well):: f = open('myfile.txt') s = f.readline() i = int(s.strip()) - except IOError as err: - print("I/O error: {0}".format(err)) + except OSError as err: + print("OS error: {0}".format(err)) except ValueError: print("Could not convert data to an integer.") except: |