Mailman 3 March 2014 - Python-checkins

cpython (merge 3.4 -> default): #16716: remove deprecation warning
by andrew.svetlov March 31, 2014

March 31, 2014

http://hg.python.org/cpython/rev/1c6c2ec8916a changeset: 90085:1c6c2ec8916a parent: 90083:f5dda52a4ccd parent: 90084:7b219429c404 user: Andrew Svetlov <andrew.svetlov(a)gmail.com> date: Tue Apr 01 02:08:41 2014 +0300 summary: #16716: remove deprecation warning files: Doc/library/select.rst | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/Doc/library/select.rst b/Doc/library/select.rst --- a/Doc/library/select.rst +++ b/Doc/library/select.rst @@ -380,10 +380,6 @@ that was never registered causes an :exc:`OSError` exception with errno :const:`ENOENT` to be raised. - .. deprecated:: 3.3 - - Instead of :exc:`IOError` the :exc:`OSError` exception is used now. - .. method:: poll.unregister(fd) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): #16716: remove deprecation warning
by andrew.svetlov March 31, 2014

March 31, 2014

http://hg.python.org/cpython/rev/7b219429c404 changeset: 90084:7b219429c404 branch: 3.4 parent: 90082:8d5f005a0da3 user: Andrew Svetlov <andrew.svetlov(a)gmail.com> date: Tue Apr 01 02:08:25 2014 +0300 summary: #16716: remove deprecation warning files: Doc/library/select.rst | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/Doc/library/select.rst b/Doc/library/select.rst --- a/Doc/library/select.rst +++ b/Doc/library/select.rst @@ -380,10 +380,6 @@ that was never registered causes an :exc:`OSError` exception with errno :const:`ENOENT` to be raised. - .. deprecated:: 3.3 - - Instead of :exc:`IOError` the :exc:`OSError` exception is used now. - .. method:: poll.unregister(fd) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): Merge 3.4: Get rid of deprecated IOError in the doc
by andrew.svetlov March 31, 2014

March 31, 2014

http://hg.python.org/cpython/rev/f5dda52a4ccd changeset: 90083:f5dda52a4ccd parent: 90081:c0c17718301f parent: 90082:8d5f005a0da3 user: Andrew Svetlov <andrew.svetlov(a)gmail.com> date: Tue Apr 01 01:14:27 2014 +0300 summary: Merge 3.4: Get rid of deprecated IOError in the doc files: Doc/c-api/exceptions.rst | 4 ++-- Doc/howto/unicode.rst | 2 +- Doc/library/importlib.rst | 12 ++++++------ Doc/tutorial/controlflow.rst | 2 +- Doc/tutorial/errors.rst | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst --- a/Doc/c-api/exceptions.rst +++ b/Doc/c-api/exceptions.rst @@ -236,8 +236,8 @@ Similar to :c:func:`PyErr_SetFromErrno`, with the additional behavior that if *filenameObject* is not *NULL*, it is passed to the constructor of *type* as - a third parameter. In the case of exceptions such as :exc:`IOError` and - :exc:`OSError`, this is used to define the :attr:`filename` attribute of the + a third parameter. In the case of :exc:`OSError` exception, + this is used to define the :attr:`filename` attribute of the exception instance. diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst --- a/Doc/howto/unicode.rst +++ b/Doc/howto/unicode.rst @@ -246,7 +246,7 @@ try: with open('/tmp/input.txt', 'r') as f: ... - except IOError: + except OSError: # 'File not found' error message. print("Fichier non trouvé") diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst --- a/Doc/library/importlib.rst +++ b/Doc/library/importlib.rst @@ -449,12 +449,12 @@ Loaders that have a file-like storage back-end that allows storing arbitrary data can implement this abstract method to give direct access - to the data stored. :exc:`IOError` is to be raised if the *path* cannot + to the data stored. :exc:`OSError` is to be raised if the *path* cannot be found. The *path* is expected to be constructed using a module's :attr:`__file__` attribute or an item from a package's :attr:`__path__`. .. versionchanged:: 3.4 - Raises :exc:`IOError` instead of :exc:`NotImplementedError`. + Raises :exc:`OSError` instead of :exc:`NotImplementedError`. .. class:: InspectLoader @@ -609,12 +609,12 @@ - ``'size'`` (optional): the size in bytes of the source code. Any other keys in the dictionary are ignored, to allow for future - extensions. If the path cannot be handled, :exc:`IOError` is raised. + extensions. If the path cannot be handled, :exc:`OSError` is raised. .. versionadded:: 3.3 .. versionchanged:: 3.4 - Raise :exc:`IOError` instead of :exc:`NotImplementedError`. + Raise :exc:`OSError` instead of :exc:`NotImplementedError`. .. method:: path_mtime(path) @@ -624,10 +624,10 @@ .. deprecated:: 3.3 This method is deprecated in favour of :meth:`path_stats`. You don't have to implement it, but it is still available for compatibility - purposes. Raise :exc:`IOError` if the path cannot be handled. + purposes. Raise :exc:`OSError` if the path cannot be handled. .. versionchanged:: 3.4 - Raise :exc:`IOError` instead of :exc:`NotImplementedError`. + Raise :exc:`OSError` instead of :exc:`NotImplementedError`. .. method:: set_data(path, data) diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst --- a/Doc/tutorial/controlflow.rst +++ b/Doc/tutorial/controlflow.rst @@ -370,7 +370,7 @@ 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 --- a/Doc/tutorial/errors.rst +++ b/Doc/tutorial/errors.rst @@ -131,8 +131,8 @@ 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: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): Get rid of deprecated IOError in the doc
by andrew.svetlov March 31, 2014

March 31, 2014

http://hg.python.org/cpython/rev/8d5f005a0da3 changeset: 90082:8d5f005a0da3 branch: 3.4 parent: 90080:de476c612548 user: Andrew Svetlov <andrew.svetlov(a)gmail.com> date: Tue Apr 01 01:13:30 2014 +0300 summary: Get rid of deprecated IOError in the doc files: Doc/c-api/exceptions.rst | 4 ++-- Doc/howto/unicode.rst | 2 +- Doc/library/importlib.rst | 12 ++++++------ Doc/tutorial/controlflow.rst | 2 +- Doc/tutorial/errors.rst | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst --- a/Doc/c-api/exceptions.rst +++ b/Doc/c-api/exceptions.rst @@ -236,8 +236,8 @@ Similar to :c:func:`PyErr_SetFromErrno`, with the additional behavior that if *filenameObject* is not *NULL*, it is passed to the constructor of *type* as - a third parameter. In the case of exceptions such as :exc:`IOError` and - :exc:`OSError`, this is used to define the :attr:`filename` attribute of the + a third parameter. In the case of :exc:`OSError` exception, + this is used to define the :attr:`filename` attribute of the exception instance. diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst --- a/Doc/howto/unicode.rst +++ b/Doc/howto/unicode.rst @@ -246,7 +246,7 @@ try: with open('/tmp/input.txt', 'r') as f: ... - except IOError: + except OSError: # 'File not found' error message. print("Fichier non trouvé") diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst --- a/Doc/library/importlib.rst +++ b/Doc/library/importlib.rst @@ -449,12 +449,12 @@ Loaders that have a file-like storage back-end that allows storing arbitrary data can implement this abstract method to give direct access - to the data stored. :exc:`IOError` is to be raised if the *path* cannot + to the data stored. :exc:`OSError` is to be raised if the *path* cannot be found. The *path* is expected to be constructed using a module's :attr:`__file__` attribute or an item from a package's :attr:`__path__`. .. versionchanged:: 3.4 - Raises :exc:`IOError` instead of :exc:`NotImplementedError`. + Raises :exc:`OSError` instead of :exc:`NotImplementedError`. .. class:: InspectLoader @@ -609,12 +609,12 @@ - ``'size'`` (optional): the size in bytes of the source code. Any other keys in the dictionary are ignored, to allow for future - extensions. If the path cannot be handled, :exc:`IOError` is raised. + extensions. If the path cannot be handled, :exc:`OSError` is raised. .. versionadded:: 3.3 .. versionchanged:: 3.4 - Raise :exc:`IOError` instead of :exc:`NotImplementedError`. + Raise :exc:`OSError` instead of :exc:`NotImplementedError`. .. method:: path_mtime(path) @@ -624,10 +624,10 @@ .. deprecated:: 3.3 This method is deprecated in favour of :meth:`path_stats`. You don't have to implement it, but it is still available for compatibility - purposes. Raise :exc:`IOError` if the path cannot be handled. + purposes. Raise :exc:`OSError` if the path cannot be handled. .. versionchanged:: 3.4 - Raise :exc:`IOError` instead of :exc:`NotImplementedError`. + Raise :exc:`OSError` instead of :exc:`NotImplementedError`. .. method:: set_data(path, data) diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst --- a/Doc/tutorial/controlflow.rst +++ b/Doc/tutorial/controlflow.rst @@ -370,7 +370,7 @@ 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 --- a/Doc/tutorial/errors.rst +++ b/Doc/tutorial/errors.rst @@ -131,8 +131,8 @@ 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: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): Merge 3.4 (#16716)
by andrew.svetlov March 31, 2014

March 31, 2014

http://hg.python.org/cpython/rev/c0c17718301f changeset: 90081:c0c17718301f parent: 90079:5ad1d523b342 parent: 90080:de476c612548 user: Andrew Svetlov <andrew.svetlov(a)gmail.com> date: Tue Apr 01 00:45:06 2014 +0300 summary: Merge 3.4 (#16716) files: Doc/library/exceptions.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst --- a/Doc/library/exceptions.rst +++ b/Doc/library/exceptions.rst @@ -82,7 +82,7 @@ .. attribute:: args The tuple of arguments given to the exception constructor. Some built-in - exceptions (like :exc:`IOError`) expect a certain number of arguments and + exceptions (like :exc:`OSError`) expect a certain number of arguments and assign a special meaning to the elements of this tuple, while others are usually called only with a single string giving an error message. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): IOError -> OSError
by andrew.svetlov March 31, 2014

March 31, 2014

http://hg.python.org/cpython/rev/de476c612548 changeset: 90080:de476c612548 branch: 3.4 parent: 90078:f507727c5dd2 user: Andrew Svetlov <andrew.svetlov(a)gmail.com> date: Tue Apr 01 00:44:13 2014 +0300 summary: IOError -> OSError files: Doc/library/exceptions.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst --- a/Doc/library/exceptions.rst +++ b/Doc/library/exceptions.rst @@ -82,7 +82,7 @@ .. attribute:: args The tuple of arguments given to the exception constructor. Some built-in - exceptions (like :exc:`IOError`) expect a certain number of arguments and + exceptions (like :exc:`OSError`) expect a certain number of arguments and assign a special meaning to the elements of this tuple, while others are usually called only with a single string giving an error message. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): Merge 3.4 (#16716)
by andrew.svetlov March 31, 2014

March 31, 2014

http://hg.python.org/cpython/rev/5ad1d523b342 changeset: 90079:5ad1d523b342 parent: 90077:fb217fc457ca parent: 90078:f507727c5dd2 user: Andrew Svetlov <andrew.svetlov(a)gmail.com> date: Tue Apr 01 00:41:04 2014 +0300 summary: Merge 3.4 (#16716) files: Doc/library/select.rst | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/Doc/library/select.rst b/Doc/library/select.rst --- a/Doc/library/select.rst +++ b/Doc/library/select.rst @@ -377,9 +377,13 @@ Modifies an already registered fd. This has the same effect as ``register(fd, eventmask)``. Attempting to modify a file descriptor - that was never registered causes an :exc:`IOError` exception with errno + that was never registered causes an :exc:`OSError` exception with errno :const:`ENOENT` to be raised. + .. deprecated:: 3.3 + + Instead of :exc:`IOError` the :exc:`OSError` exception is used now. + .. method:: poll.unregister(fd) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): Fix the doc: add deprecation warning in select module.
by andrew.svetlov March 31, 2014

March 31, 2014

http://hg.python.org/cpython/rev/f507727c5dd2 changeset: 90078:f507727c5dd2 branch: 3.4 parent: 90076:c42cce290d50 user: Andrew Svetlov <andrew.svetlov(a)gmail.com> date: Tue Apr 01 00:23:23 2014 +0300 summary: Fix the doc: add deprecation warning in select module. files: Doc/library/select.rst | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/Doc/library/select.rst b/Doc/library/select.rst --- a/Doc/library/select.rst +++ b/Doc/library/select.rst @@ -377,9 +377,13 @@ Modifies an already registered fd. This has the same effect as ``register(fd, eventmask)``. Attempting to modify a file descriptor - that was never registered causes an :exc:`IOError` exception with errno + that was never registered causes an :exc:`OSError` exception with errno :const:`ENOENT` to be raised. + .. deprecated:: 3.3 + + Instead of :exc:`IOError` the :exc:`OSError` exception is used now. + .. method:: poll.unregister(fd) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): Issue #21073: explain why Py_ReprEnter() allows for a missing thread state.
by antoine.pitrou March 31, 2014

March 31, 2014

http://hg.python.org/cpython/rev/fb217fc457ca changeset: 90077:fb217fc457ca parent: 90075:c8bef5664305 parent: 90076:c42cce290d50 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Mon Mar 31 22:05:02 2014 +0200 summary: Issue #21073: explain why Py_ReprEnter() allows for a missing thread state. files: Objects/object.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -1849,6 +1849,8 @@ Py_ssize_t i; dict = PyThreadState_GetDict(); + /* Ignore a missing thread-state, so that this function can be called + early on startup. */ if (dict == NULL) return 0; list = _PyDict_GetItemId(dict, &PyId_Py_Repr); -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): Issue #21073: explain why Py_ReprEnter() allows for a missing thread state.
by antoine.pitrou March 31, 2014

March 31, 2014

http://hg.python.org/cpython/rev/c42cce290d50 changeset: 90076:c42cce290d50 branch: 3.4 parent: 90074:d6fa1b30cdac user: Antoine Pitrou <solipsis(a)pitrou.net> date: Mon Mar 31 22:04:38 2014 +0200 summary: Issue #21073: explain why Py_ReprEnter() allows for a missing thread state. files: Objects/object.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -1849,6 +1849,8 @@ Py_ssize_t i; dict = PyThreadState_GetDict(); + /* Ignore a missing thread-state, so that this function can be called + early on startup. */ if (dict == NULL) return 0; list = _PyDict_GetItemId(dict, &PyId_Py_Repr); -- Repository URL: http://hg.python.org/cpython

1 0