diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-05-30 05:24:49 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-05-30 05:24:49 (GMT) |
| commit | e514093a2ff13c2479dae7967fa21fef21e62267 (patch) | |
| tree | a754e5e0497e0320d8eef63bf0756599cdae5b3a /Doc/library/enum.rst | |
| parent | 137bac265e5e22a44680799859666cc18bb4af3c (diff) | |
| parent | a90a4a96517fe25b57246083076b247f417d737d (diff) | |
| download | cpython-e514093a2ff13c2479dae7967fa21fef21e62267.zip cpython-e514093a2ff13c2479dae7967fa21fef21e62267.tar.gz cpython-e514093a2ff13c2479dae7967fa21fef21e62267.tar.bz2 | |
Issue #27125: Merge typo fixes from 3.5
Diffstat (limited to 'Doc/library/enum.rst')
| -rw-r--r-- | Doc/library/enum.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst index b3691ca..99a7f8e 100644 --- a/Doc/library/enum.rst +++ b/Doc/library/enum.rst @@ -314,8 +314,8 @@ Then:: >>> str(Mood.funky) 'my custom str! 1' -The rules for what is allowed are as follows: names that start and end with a -with a single underscore are reserved by enum and cannot be used; all other +The rules for what is allowed are as follows: names that start and end with +a single underscore are reserved by enum and cannot be used; all other attributes defined within an enumeration will become members of this enumeration, with the exception of special methods (:meth:`__str__`, :meth:`__add__`, etc.) and descriptors (methods are also descriptors). |