diff options
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/collections.rst | 18 | ||||
| -rw-r--r-- | Doc/library/decimal.rst | 2 | ||||
| -rw-r--r-- | Doc/library/stdtypes.rst | 11 | ||||
| -rw-r--r-- | Doc/tutorial/inputoutput.rst | 2 |
4 files changed, 20 insertions, 13 deletions
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst index 227f721..274ca15 100644 --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -395,8 +395,8 @@ Setting the :attr:`default_factory` to :class:`set` makes the .. _named-tuple-factory: -:func:`NamedTuple` factory function ------------------------------------ +:func:`NamedTuple` Factory Function for Tuples with Named Fields +---------------------------------------------------------------- Named tuples assign meaning to each position in a tuple and allow for more readable, self-documenting code. They can be used wherever regular tuples are used, and @@ -411,12 +411,12 @@ they add the ability to access fields by name instead of position index. method which lists the tuple contents in a ``name=value`` format. The *fieldnames* are specified in a single string with each fieldname separated by - a space and/or comma. Any valid Python identifier may be used for a field name. + a space and/or comma. Any valid Python identifier may be used for a fieldname. - If *verbose* is true, the *NamedTuple* call will print the class definition. + If *verbose* is true, will print the class definition. *NamedTuple* instances do not have per-instance dictionaries, so they are - lightweight, requiring no more memory than regular tuples. + lightweight and require no more memory than regular tuples. Example:: @@ -467,7 +467,9 @@ an additonal method and an informational read-only attribute. .. method:: somenamedtuple.replace(field, value) - Return a new instance of the named tuple replacing the named *field* with a new *value*:: + Return a new instance of the named tuple replacing the named *field* with a new *value*: + +:: >>> p = Point(x=11, y=22) >>> p.__replace__('x', 33) @@ -480,7 +482,9 @@ an additonal method and an informational read-only attribute. Return a tuple of strings listing the field names. This is useful for introspection, for converting a named tuple instance to a dictionary, and for combining named tuple - types to create new named tuple types:: + types to create new named tuple types: + +:: >>> p.__fields__ # view the field names ('x', 'y') diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst index bbac0d4..ee4aeec 100644 --- a/Doc/library/decimal.rst +++ b/Doc/library/decimal.rst @@ -977,7 +977,7 @@ method. For example, ``C.exp(x)`` is equivalent to The usual approach to working with decimals is to create :class:`Decimal` instances and then apply arithmetic operations which take place within the -current context for the active thread. An alternate approach is to use context +current context for the active thread. An alternative approach is to use context methods for calculating within a specific context. The methods are similar to those for the :class:`Decimal` class and are only briefly recounted here. diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 75db75c..1a0bdf3 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -657,10 +657,13 @@ String Methods .. index:: pair: string; methods -String objects support the methods listed below. In addition, Python's strings -support the sequence type methods described in the :ref:`typesseq` section. To -output formatted strings, see the :ref:`string-formatting` section. Also, see -the :mod:`re` module for string functions based on regular expressions. +String objects support the methods listed below. Note that none of these +methods take keyword arguments. + +In addition, Python's strings support the sequence type methods described in +the :ref:`typesseq` section. To output formatted strings, see the +:ref:`string-formatting` section. Also, see the :mod:`re` module for string +functions based on regular expressions. .. method:: str.capitalize() diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst index 54f4403..2f4cdd3 100644 --- a/Doc/tutorial/inputoutput.rst +++ b/Doc/tutorial/inputoutput.rst @@ -252,7 +252,7 @@ having to load the entire file in memory. Only complete lines will be returned. >>> f.readlines() ['This is the first line of the file.\n', 'Second line of the file\n'] -An alternate approach to reading lines is to loop over the file object. This is +An alternative approach to reading lines is to loop over the file object. This is memory efficient, fast, and leads to simpler code:: >>> for line in f: |