diff --git a/pep-0352.txt b/pep-0352.txt index 41847f9b6..91b282aa1 100644 --- a/pep-0352.txt +++ b/pep-0352.txt @@ -276,7 +276,7 @@ attribute in Python 3.0 at the PyCon 2007 sprint [#pycon2007-sprint-email]_, it was discovered that the transition was very painful, especially for C extension modules. It was decided that it would be better to deprecate the ``message`` attribute in -Python 2.6 (and remove in Python 2.7 and Python 3.0) and consider a +Python 2.6 (and remove it in Python 2.7 and Python 3.0) and consider a more long-term transition strategy in Python 3.0 to remove multiple-argument support in BaseException in preference of accepting only a single argument. Thus the introduction of ``message`` and the diff --git a/pep-3100.txt b/pep-3100.txt index af4b6fd3d..5997c030e 100644 --- a/pep-3100.txt +++ b/pep-3100.txt @@ -190,7 +190,7 @@ To be removed: * ``intern()``: put in ``sys`` [2]_, [22]_ [done] * ``reduce()``: write a loop instead [2]_, [9]_ [done] * ``xrange()``: use ``range()`` instead [1]_ [See range() above] [done] -* ``StandardError``: this is a relic from the original exception hierachy; +* ``StandardError``: this is a relic from the original exception hierarchy; subclass ``Exception`` instead. [done] diff --git a/pep-3119.txt b/pep-3119.txt index 9a40b0c50..aa0a48a2a 100644 --- a/pep-3119.txt +++ b/pep-3119.txt @@ -162,7 +162,7 @@ interpreters running in the same address space, as is used by mod_python [16]_). Another example would be someone who wants to define a generic -function (PEP 3124) for any sequences that has an ``append()`` method. +function (PEP 3124) for any sequence that has an ``append()`` method. The ``Sequence`` ABC (see below) doesn't promise the ``append()`` method, while ``MutableSequence`` requires not only ``append()`` but also various other mutating methods. @@ -512,7 +512,7 @@ special method; for example:: return hasattr(C, "__bases__") and hasattr(C, "__len__") This has the advantage of not requiring explicit registration. -However, the semantics hard to get exactly right given the confusing +However, the semantics are hard to get exactly right given the confusing semantics of instance attributes vs. class attributes, and that a class is an instance of its metaclass; the check for ``__bases__`` is only an approximation of the desired semantics. **Strawman:** Let's