2007-08-15 11:28:22 -03:00
|
|
|
|
|
|
|
:mod:`string` --- Common string operations
|
|
|
|
==========================================
|
|
|
|
|
|
|
|
.. module:: string
|
|
|
|
:synopsis: Common string operations.
|
|
|
|
|
|
|
|
|
|
|
|
.. index:: module: re
|
|
|
|
|
2007-08-31 06:22:56 -03:00
|
|
|
The :mod:`string` module contains a number of useful constants and classes, as
|
|
|
|
well as some deprecated legacy functions that are also available as methods on
|
|
|
|
strings. In addition, Python's built-in string classes support the sequence type
|
|
|
|
methods described in the :ref:`typesseq` section, and also the string-specific
|
|
|
|
methods described in the :ref:`string-methods` section. To output formatted
|
|
|
|
strings, see the :ref:`string-formatting` section. Also, see the :mod:`re`
|
|
|
|
module for string functions based on regular expressions.
|
2007-08-15 11:28:22 -03:00
|
|
|
|
|
|
|
|
|
|
|
String constants
|
|
|
|
----------------
|
|
|
|
|
|
|
|
The constants defined in this module are:
|
|
|
|
|
|
|
|
|
|
|
|
.. data:: ascii_letters
|
|
|
|
|
|
|
|
The concatenation of the :const:`ascii_lowercase` and :const:`ascii_uppercase`
|
|
|
|
constants described below. This value is not locale-dependent.
|
|
|
|
|
|
|
|
|
|
|
|
.. data:: ascii_lowercase
|
|
|
|
|
|
|
|
The lowercase letters ``'abcdefghijklmnopqrstuvwxyz'``. This value is not
|
|
|
|
locale-dependent and will not change.
|
|
|
|
|
|
|
|
|
|
|
|
.. data:: ascii_uppercase
|
|
|
|
|
|
|
|
The uppercase letters ``'ABCDEFGHIJKLMNOPQRSTUVWXYZ'``. This value is not
|
|
|
|
locale-dependent and will not change.
|
|
|
|
|
|
|
|
|
|
|
|
.. data:: digits
|
|
|
|
|
|
|
|
The string ``'0123456789'``.
|
|
|
|
|
|
|
|
|
|
|
|
.. data:: hexdigits
|
|
|
|
|
|
|
|
The string ``'0123456789abcdefABCDEF'``.
|
|
|
|
|
|
|
|
|
|
|
|
.. data:: octdigits
|
|
|
|
|
|
|
|
The string ``'01234567'``.
|
|
|
|
|
|
|
|
|
|
|
|
.. data:: punctuation
|
|
|
|
|
|
|
|
String of ASCII characters which are considered punctuation characters
|
|
|
|
in the ``C`` locale.
|
|
|
|
|
|
|
|
|
|
|
|
.. data:: printable
|
|
|
|
|
|
|
|
String of ASCII characters which are considered printable. This is a
|
|
|
|
combination of :const:`digits`, :const:`ascii_letters`, :const:`punctuation`,
|
|
|
|
and :const:`whitespace`.
|
|
|
|
|
|
|
|
|
|
|
|
.. data:: whitespace
|
|
|
|
|
2008-11-22 04:31:09 -04:00
|
|
|
A string containing all ASCII characters that are considered whitespace.
|
2007-08-15 11:28:22 -03:00
|
|
|
This includes the characters space, tab, linefeed, return, formfeed, and
|
|
|
|
vertical tab.
|
|
|
|
|
|
|
|
|
2007-08-31 06:22:56 -03:00
|
|
|
.. _string-formatting:
|
|
|
|
|
|
|
|
String Formatting
|
|
|
|
-----------------
|
|
|
|
|
2008-05-25 16:45:17 -03:00
|
|
|
The built-in string class provides the ability to do complex variable
|
|
|
|
substitutions and value formatting via the :func:`format` method described in
|
|
|
|
:pep:`3101`. The :class:`Formatter` class in the :mod:`string` module allows
|
|
|
|
you to create and customize your own string formatting behaviors using the same
|
|
|
|
implementation as the built-in :meth:`format` method.
|
2007-08-31 06:22:56 -03:00
|
|
|
|
|
|
|
.. class:: Formatter
|
|
|
|
|
|
|
|
The :class:`Formatter` class has the following public methods:
|
|
|
|
|
|
|
|
.. method:: format(format_string, *args, *kwargs)
|
|
|
|
|
|
|
|
:meth:`format` is the primary API method. It takes a format template
|
|
|
|
string, and an arbitrary set of positional and keyword argument.
|
|
|
|
:meth:`format` is just a wrapper that calls :meth:`vformat`.
|
|
|
|
|
|
|
|
.. method:: vformat(format_string, args, kwargs)
|
|
|
|
|
|
|
|
This function does the actual work of formatting. It is exposed as a
|
|
|
|
separate function for cases where you want to pass in a predefined
|
|
|
|
dictionary of arguments, rather than unpacking and repacking the
|
|
|
|
dictionary as individual arguments using the ``*args`` and ``**kwds``
|
|
|
|
syntax. :meth:`vformat` does the work of breaking up the format template
|
|
|
|
string into character data and replacement fields. It calls the various
|
|
|
|
methods described below.
|
|
|
|
|
|
|
|
In addition, the :class:`Formatter` defines a number of methods that are
|
|
|
|
intended to be replaced by subclasses:
|
|
|
|
|
|
|
|
.. method:: parse(format_string)
|
|
|
|
|
|
|
|
Loop over the format_string and return an iterable of tuples
|
|
|
|
(*literal_text*, *field_name*, *format_spec*, *conversion*). This is used
|
|
|
|
by :meth:`vformat` to break the string in to either literal text, or
|
|
|
|
replacement fields.
|
|
|
|
|
|
|
|
The values in the tuple conceptually represent a span of literal text
|
|
|
|
followed by a single replacement field. If there is no literal text
|
|
|
|
(which can happen if two replacement fields occur consecutively), then
|
|
|
|
*literal_text* will be a zero-length string. If there is no replacement
|
|
|
|
field, then the values of *field_name*, *format_spec* and *conversion*
|
|
|
|
will be ``None``.
|
|
|
|
|
2007-09-02 12:33:26 -03:00
|
|
|
.. method:: get_field(field_name, args, kwargs)
|
2007-08-31 06:22:56 -03:00
|
|
|
|
|
|
|
Given *field_name* as returned by :meth:`parse` (see above), convert it to
|
2007-08-31 07:37:15 -03:00
|
|
|
an object to be formatted. Returns a tuple (obj, used_key). The default
|
|
|
|
version takes strings of the form defined in :pep:`3101`, such as
|
|
|
|
"0[name]" or "label.title". *args* and *kwargs* are as passed in to
|
|
|
|
:meth:`vformat`. The return value *used_key* has the same meaning as the
|
|
|
|
*key* parameter to :meth:`get_value`.
|
2007-08-31 06:22:56 -03:00
|
|
|
|
|
|
|
.. method:: get_value(key, args, kwargs)
|
|
|
|
|
|
|
|
Retrieve a given field value. The *key* argument will be either an
|
|
|
|
integer or a string. If it is an integer, it represents the index of the
|
|
|
|
positional argument in *args*; if it is a string, then it represents a
|
|
|
|
named argument in *kwargs*.
|
|
|
|
|
|
|
|
The *args* parameter is set to the list of positional arguments to
|
|
|
|
:meth:`vformat`, and the *kwargs* parameter is set to the dictionary of
|
|
|
|
keyword arguments.
|
|
|
|
|
|
|
|
For compound field names, these functions are only called for the first
|
|
|
|
component of the field name; Subsequent components are handled through
|
|
|
|
normal attribute and indexing operations.
|
|
|
|
|
|
|
|
So for example, the field expression '0.name' would cause
|
|
|
|
:meth:`get_value` to be called with a *key* argument of 0. The ``name``
|
|
|
|
attribute will be looked up after :meth:`get_value` returns by calling the
|
|
|
|
built-in :func:`getattr` function.
|
|
|
|
|
|
|
|
If the index or keyword refers to an item that does not exist, then an
|
|
|
|
:exc:`IndexError` or :exc:`KeyError` should be raised.
|
|
|
|
|
|
|
|
.. method:: check_unused_args(used_args, args, kwargs)
|
|
|
|
|
|
|
|
Implement checking for unused arguments if desired. The arguments to this
|
|
|
|
function is the set of all argument keys that were actually referred to in
|
|
|
|
the format string (integers for positional arguments, and strings for
|
|
|
|
named arguments), and a reference to the *args* and *kwargs* that was
|
|
|
|
passed to vformat. The set of unused args can be calculated from these
|
|
|
|
parameters. :meth:`check_unused_args` is assumed to throw an exception if
|
|
|
|
the check fails.
|
|
|
|
|
|
|
|
.. method:: format_field(value, format_spec)
|
|
|
|
|
|
|
|
:meth:`format_field` simply calls the global :func:`format` built-in. The
|
|
|
|
method is provided so that subclasses can override it.
|
|
|
|
|
|
|
|
.. method:: convert_field(value, conversion)
|
|
|
|
|
|
|
|
Converts the value (returned by :meth:`get_field`) given a conversion type
|
|
|
|
(as in the tuple returned by the :meth:`parse` method.) The default
|
|
|
|
version understands 'r' (repr) and 's' (str) conversion types.
|
|
|
|
|
|
|
|
|
|
|
|
.. _formatstrings:
|
|
|
|
|
|
|
|
Format String Syntax
|
|
|
|
--------------------
|
|
|
|
|
|
|
|
The :meth:`str.format` method and the :class:`Formatter` class share the same
|
|
|
|
syntax for format strings (although in the case of :class:`Formatter`,
|
|
|
|
subclasses can define their own format string syntax.)
|
|
|
|
|
|
|
|
Format strings contain "replacement fields" surrounded by curly braces ``{}``.
|
|
|
|
Anything that is not contained in braces is considered literal text, which is
|
|
|
|
copied unchanged to the output. If you need to include a brace character in the
|
|
|
|
literal text, it can be escaped by doubling: ``{{`` and ``}}``.
|
|
|
|
|
|
|
|
The grammar for a replacement field is as follows:
|
|
|
|
|
|
|
|
.. productionlist:: sf
|
|
|
|
replacement_field: "{" `field_name` ["!" `conversion`] [":" `format_spec`] "}"
|
|
|
|
field_name: (`identifier` | `integer`) ("." `attribute_name` | "[" element_index "]")*
|
|
|
|
attribute_name: `identifier`
|
|
|
|
element_index: `integer`
|
2008-11-08 21:43:02 -04:00
|
|
|
conversion: "r" | "s" | "a"
|
2007-08-31 06:22:56 -03:00
|
|
|
format_spec: <described in the next section>
|
|
|
|
|
|
|
|
In less formal terms, the replacement field starts with a *field_name*, which
|
|
|
|
can either be a number (for a positional argument), or an identifier (for
|
|
|
|
keyword arguments). Following this is an optional *conversion* field, which is
|
|
|
|
preceded by an exclamation point ``'!'``, and a *format_spec*, which is preceded
|
|
|
|
by a colon ``':'``.
|
|
|
|
|
|
|
|
The *field_name* itself begins with either a number or a keyword. If it's a
|
|
|
|
number, it refers to a positional argument, and if it's a keyword it refers to a
|
|
|
|
named keyword argument. This can be followed by any number of index or
|
|
|
|
attribute expressions. An expression of the form ``'.name'`` selects the named
|
|
|
|
attribute using :func:`getattr`, while an expression of the form ``'[index]'``
|
|
|
|
does an index lookup using :func:`__getitem__`.
|
|
|
|
|
|
|
|
Some simple format string examples::
|
|
|
|
|
|
|
|
"First, thou shalt count to {0}" # References first positional argument
|
|
|
|
"My quest is {name}" # References keyword argument 'name'
|
|
|
|
"Weight in tons {0.weight}" # 'weight' attribute of first positional arg
|
|
|
|
"Units destroyed: {players[0]}" # First element of keyword argument 'players'.
|
|
|
|
|
|
|
|
The *conversion* field causes a type coercion before formatting. Normally, the
|
|
|
|
job of formatting a value is done by the :meth:`__format__` method of the value
|
|
|
|
itself. However, in some cases it is desirable to force a type to be formatted
|
|
|
|
as a string, overriding its own definition of formatting. By converting the
|
|
|
|
value to a string before calling :meth:`__format__`, the normal formatting logic
|
|
|
|
is bypassed.
|
|
|
|
|
2008-06-11 15:37:52 -03:00
|
|
|
Three conversion flags are currently supported: ``'!s'`` which calls :func:`str`
|
|
|
|
on the value, ``'!r'`` which calls :func:`repr` and ``'!a'`` which calls
|
|
|
|
:func:`ascii`.
|
2007-08-31 06:22:56 -03:00
|
|
|
|
|
|
|
Some examples::
|
|
|
|
|
|
|
|
"Harold's a clever {0!s}" # Calls str() on the argument first
|
|
|
|
"Bring out the holy {name!r}" # Calls repr() on the argument first
|
|
|
|
|
|
|
|
The *format_spec* field contains a specification of how the value should be
|
|
|
|
presented, including such details as field width, alignment, padding, decimal
|
|
|
|
precision and so on. Each value type can define it's own "formatting
|
|
|
|
mini-language" or interpretation of the *format_spec*.
|
|
|
|
|
|
|
|
Most built-in types support a common formatting mini-language, which is
|
|
|
|
described in the next section.
|
|
|
|
|
|
|
|
A *format_spec* field can also include nested replacement fields within it.
|
|
|
|
These nested replacement fields can contain only a field name; conversion flags
|
|
|
|
and format specifications are not allowed. The replacement fields within the
|
|
|
|
format_spec are substituted before the *format_spec* string is interpreted.
|
|
|
|
This allows the formatting of a value to be dynamically specified.
|
|
|
|
|
|
|
|
For example, suppose you wanted to have a replacement field whose field width is
|
|
|
|
determined by another variable::
|
|
|
|
|
|
|
|
"A man with two {0:{1}}".format("noses", 10)
|
|
|
|
|
|
|
|
This would first evaluate the inner replacement field, making the format string
|
|
|
|
effectively::
|
|
|
|
|
|
|
|
"A man with two {0:10}"
|
|
|
|
|
|
|
|
Then the outer replacement field would be evaluated, producing::
|
|
|
|
|
|
|
|
"noses "
|
|
|
|
|
Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r64722 | georg.brandl | 2008-07-05 12:13:36 +0200 (Sat, 05 Jul 2008) | 4 lines
#2663: support an *ignore* argument to shutil.copytree(). Patch by Tarek Ziade.
This is a new feature, but Barry authorized adding it in the beta period.
........
r64729 | mark.dickinson | 2008-07-05 13:33:52 +0200 (Sat, 05 Jul 2008) | 5 lines
Issue 3188: accept float('infinity') as well as float('inf'). This
makes the float constructor behave in the same way as specified
by various other language standards, including C99, IEEE 754r,
and the IBM Decimal standard.
........
r64753 | gregory.p.smith | 2008-07-06 05:35:58 +0200 (Sun, 06 Jul 2008) | 4 lines
- Issue #2862: Make int and float freelist management consistent with other
freelists. Changes their CompactFreeList apis into ClearFreeList apis and
calls them via gc.collect().
........
r64845 | raymond.hettinger | 2008-07-10 16:03:19 +0200 (Thu, 10 Jul 2008) | 1 line
Issue 3301: Bisect functions behaved badly when lo was negative.
........
r64846 | raymond.hettinger | 2008-07-10 16:34:57 +0200 (Thu, 10 Jul 2008) | 1 line
Issue 3285: Fractions from_float() and from_decimal() accept Integral arguments.
........
r64849 | andrew.kuchling | 2008-07-10 16:43:31 +0200 (Thu, 10 Jul 2008) | 1 line
Wording changes
........
r64871 | raymond.hettinger | 2008-07-11 14:00:21 +0200 (Fri, 11 Jul 2008) | 1 line
Add cautionary note on the use of PySequence_Fast_ITEMS.
........
r64880 | amaury.forgeotdarc | 2008-07-11 23:28:25 +0200 (Fri, 11 Jul 2008) | 5 lines
#3317 in zipfile module, restore the previous names of global variables:
some applications relied on them.
Also remove duplicated lines.
........
r64881 | amaury.forgeotdarc | 2008-07-11 23:45:06 +0200 (Fri, 11 Jul 2008) | 3 lines
#3342: In tracebacks, printed source lines were not indented since r62555.
#3343: Py_DisplaySourceLine should be a private function. Rename it to _Py_DisplaySourceLine.
........
r64882 | josiah.carlson | 2008-07-12 00:17:14 +0200 (Sat, 12 Jul 2008) | 2 lines
Fix for the AttributeError in test_asynchat.
........
r64885 | josiah.carlson | 2008-07-12 01:26:59 +0200 (Sat, 12 Jul 2008) | 2 lines
Fixed test for asyncore.
........
r64888 | matthias.klose | 2008-07-12 09:51:48 +0200 (Sat, 12 Jul 2008) | 2 lines
- Fix bashisms in Tools/faqwiz/move-faqwiz.sh
........
r64897 | benjamin.peterson | 2008-07-12 22:16:19 +0200 (Sat, 12 Jul 2008) | 1 line
fix various doc typos #3320
........
r64900 | alexandre.vassalotti | 2008-07-13 00:06:53 +0200 (Sun, 13 Jul 2008) | 2 lines
Fixed typo.
........
r64901 | benjamin.peterson | 2008-07-13 01:41:19 +0200 (Sun, 13 Jul 2008) | 1 line
#1778443 robotparser fixes from Aristotelis Mikropoulos
........
r64915 | nick.coghlan | 2008-07-13 16:52:36 +0200 (Sun, 13 Jul 2008) | 1 line
Fix issue 3221 by emitting a RuntimeWarning instead of raising SystemError when the parent module can't be found during an absolute import (likely due to non-PEP 361 aware code which sets a module level __package__ attribute)
........
r64926 | martin.v.loewis | 2008-07-13 22:31:49 +0200 (Sun, 13 Jul 2008) | 2 lines
Add turtle into the module index.
........
r64927 | alexandre.vassalotti | 2008-07-13 22:42:44 +0200 (Sun, 13 Jul 2008) | 3 lines
Issue #3274: Use a less common identifier for the temporary variable
in Py_CLEAR().
........
r64928 | andrew.kuchling | 2008-07-13 23:43:25 +0200 (Sun, 13 Jul 2008) | 1 line
Re-word
........
r64929 | andrew.kuchling | 2008-07-13 23:43:52 +0200 (Sun, 13 Jul 2008) | 1 line
Add various items; move ctypes items into a subsection of their own
........
r64938 | andrew.kuchling | 2008-07-14 02:35:32 +0200 (Mon, 14 Jul 2008) | 1 line
Typo fixes
........
r64939 | andrew.kuchling | 2008-07-14 02:40:55 +0200 (Mon, 14 Jul 2008) | 1 line
Typo fix
........
r64940 | andrew.kuchling | 2008-07-14 03:18:16 +0200 (Mon, 14 Jul 2008) | 1 line
Typo fix
........
r64941 | andrew.kuchling | 2008-07-14 03:18:31 +0200 (Mon, 14 Jul 2008) | 1 line
Expand the multiprocessing section
........
r64944 | gregory.p.smith | 2008-07-14 08:06:48 +0200 (Mon, 14 Jul 2008) | 7 lines
Fix posix.fork1() / os.fork1() to only call PyOS_AfterFork() in the child
process rather than both parent and child.
Does anyone actually use fork1()? It appears to be a Solaris thing
but if Python is built with pthreads on Solaris, fork1() and fork()
should be the same.
........
r64961 | jesse.noller | 2008-07-15 15:47:33 +0200 (Tue, 15 Jul 2008) | 1 line
multiprocessing/connection.py patch to remove fqdn oddness for issue 3270
........
r64966 | nick.coghlan | 2008-07-15 17:40:22 +0200 (Tue, 15 Jul 2008) | 1 line
Add missing NEWS entry for r64962
........
r64973 | jesse.noller | 2008-07-15 20:29:18 +0200 (Tue, 15 Jul 2008) | 1 line
Revert 3270 patch: self._address is in pretty widespread use, need to revisit
........
2008-07-16 09:55:28 -03:00
|
|
|
Which is substituted into the string, yielding::
|
2007-08-31 06:22:56 -03:00
|
|
|
|
|
|
|
"A man with two noses "
|
|
|
|
|
|
|
|
(The extra space is because we specified a field width of 10, and because left
|
|
|
|
alignment is the default for strings.)
|
|
|
|
|
|
|
|
|
|
|
|
.. _formatspec:
|
|
|
|
|
|
|
|
Format Specification Mini-Language
|
|
|
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
|
|
|
|
|
|
"Format specifications" are used within replacement fields contained within a
|
|
|
|
format string to define how individual values are presented (see
|
|
|
|
:ref:`formatstrings`.) They can also be passed directly to the builtin
|
|
|
|
:func:`format` function. Each formattable type may define how the format
|
|
|
|
specification is to be interpreted.
|
|
|
|
|
|
|
|
Most built-in types implement the following options for format specifications,
|
|
|
|
although some of the formatting options are only supported by the numeric types.
|
|
|
|
|
|
|
|
A general convention is that an empty format string (``""``) produces the same
|
2008-01-11 08:58:40 -04:00
|
|
|
result as if you had called :func:`str` on the value.
|
2007-08-31 06:22:56 -03:00
|
|
|
|
|
|
|
The general form of a *standard format specifier* is:
|
|
|
|
|
|
|
|
.. productionlist:: sf
|
2008-07-15 21:15:35 -03:00
|
|
|
format_spec: [[`fill`]`align`][`sign`][#][0][`width`][.`precision`][`type`]
|
2007-08-31 06:22:56 -03:00
|
|
|
fill: <a character other than '}'>
|
|
|
|
align: "<" | ">" | "=" | "^"
|
|
|
|
sign: "+" | "-" | " "
|
|
|
|
width: `integer`
|
|
|
|
precision: `integer`
|
|
|
|
type: "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "x" | "X" | "%"
|
|
|
|
|
|
|
|
The *fill* character can be any character other than '}' (which signifies the
|
|
|
|
end of the field). The presence of a fill character is signaled by the *next*
|
|
|
|
character, which must be one of the alignment options. If the second character
|
|
|
|
of *format_spec* is not a valid alignment option, then it is assumed that both
|
|
|
|
the fill character and the alignment option are absent.
|
|
|
|
|
|
|
|
The meaning of the various alignment options is as follows:
|
|
|
|
|
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
| Option | Meaning |
|
|
|
|
+=========+==========================================================+
|
|
|
|
| ``'<'`` | Forces the field to be left-aligned within the available |
|
|
|
|
| | space (This is the default.) |
|
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
| ``'>'`` | Forces the field to be right-aligned within the |
|
|
|
|
| | available space. |
|
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
| ``'='`` | Forces the padding to be placed after the sign (if any) |
|
|
|
|
| | but before the digits. This is used for printing fields |
|
|
|
|
| | in the form '+000000120'. This alignment option is only |
|
|
|
|
| | valid for numeric types. |
|
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
| ``'^'`` | Forces the field to be centered within the available |
|
|
|
|
| | space. |
|
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
|
|
|
|
Note that unless a minimum field width is defined, the field width will always
|
|
|
|
be the same size as the data to fill it, so that the alignment option has no
|
|
|
|
meaning in this case.
|
|
|
|
|
|
|
|
The *sign* option is only valid for number types, and can be one of the
|
|
|
|
following:
|
|
|
|
|
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
| Option | Meaning |
|
|
|
|
+=========+==========================================================+
|
|
|
|
| ``'+'`` | indicates that a sign should be used for both |
|
|
|
|
| | positive as well as negative numbers. |
|
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
| ``'-'`` | indicates that a sign should be used only for negative |
|
|
|
|
| | numbers (this is the default behavior). |
|
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
| space | indicates that a leading space should be used on |
|
|
|
|
| | positive numbers, and a minus sign on negative numbers. |
|
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
|
Merged revisions 66394,66404,66412,66414,66424-66436 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66394 | benjamin.peterson | 2008-09-11 17:04:02 -0500 (Thu, 11 Sep 2008) | 1 line
fix typo
........
r66404 | gerhard.haering | 2008-09-12 08:54:06 -0500 (Fri, 12 Sep 2008) | 2 lines
sqlite3 module: Mark iterdump() method as "Non-standard" like all the other methods not found in DB-API.
........
r66412 | gerhard.haering | 2008-09-12 13:58:57 -0500 (Fri, 12 Sep 2008) | 2 lines
Fixes issue #3103. In the sqlite3 module, made one more function static. All renaming public symbos now have the pysqlite prefix to avoid name clashes. This at least once created problems where the same symbol name appeared somewhere in Apache and the sqlite3 module was used from mod_python.
........
r66414 | gerhard.haering | 2008-09-12 17:33:22 -0500 (Fri, 12 Sep 2008) | 2 lines
Issue #3846: Release GIL during calls to sqlite3_prepare. This improves concurrent access to the same database file from multiple threads/processes.
........
r66424 | andrew.kuchling | 2008-09-12 20:22:08 -0500 (Fri, 12 Sep 2008) | 1 line
#687648 from Robert Schuppenies: use classic division. (RM Barry gave permission to update the demos.)
........
r66425 | andrew.kuchling | 2008-09-12 20:27:33 -0500 (Fri, 12 Sep 2008) | 1 line
#687648 from Robert Schuppenies: use classic division. From me: don't use string exception; flush stdout after printing
........
r66426 | andrew.kuchling | 2008-09-12 20:34:41 -0500 (Fri, 12 Sep 2008) | 1 line
#687648 from Robert Schuppenies: use classic division. From me: don't use string exception; add __main__ section
........
r66427 | andrew.kuchling | 2008-09-12 20:42:55 -0500 (Fri, 12 Sep 2008) | 1 line
#687648 from Robert Schuppenies: use classic division. From me: remove two stray semicolons
........
r66428 | andrew.kuchling | 2008-09-12 20:43:28 -0500 (Fri, 12 Sep 2008) | 1 line
#687648 from Robert Schuppenies: use classic division.
........
r66429 | andrew.kuchling | 2008-09-12 20:47:02 -0500 (Fri, 12 Sep 2008) | 1 line
Remove semicolon
........
r66430 | andrew.kuchling | 2008-09-12 20:48:36 -0500 (Fri, 12 Sep 2008) | 1 line
Subclass exception
........
r66431 | andrew.kuchling | 2008-09-12 20:56:56 -0500 (Fri, 12 Sep 2008) | 1 line
Fix SyntaxError
........
r66432 | andrew.kuchling | 2008-09-12 20:57:25 -0500 (Fri, 12 Sep 2008) | 1 line
Update uses of string exceptions
........
r66433 | andrew.kuchling | 2008-09-12 21:08:30 -0500 (Fri, 12 Sep 2008) | 1 line
Use title case
........
r66434 | andrew.kuchling | 2008-09-12 21:09:15 -0500 (Fri, 12 Sep 2008) | 1 line
Remove extra 'the'; the following title includes it
........
r66435 | andrew.kuchling | 2008-09-12 21:11:51 -0500 (Fri, 12 Sep 2008) | 1 line
#3288: Document as_integer_ratio
........
r66436 | andrew.kuchling | 2008-09-12 21:14:15 -0500 (Fri, 12 Sep 2008) | 1 line
Use title case
........
2008-09-13 12:58:53 -03:00
|
|
|
The ``'#'`` option is only valid for integers, and only for binary, octal, or
|
|
|
|
hexadecimal output. If present, it specifies that the output will be prefixed
|
|
|
|
by ``'0b'``, ``'0o'``, or ``'0x'``, respectively.
|
2008-07-15 21:15:35 -03:00
|
|
|
|
2007-08-31 06:22:56 -03:00
|
|
|
*width* is a decimal integer defining the minimum field width. If not
|
|
|
|
specified, then the field width will be determined by the content.
|
|
|
|
|
|
|
|
If the *width* field is preceded by a zero (``'0'``) character, this enables
|
|
|
|
zero-padding. This is equivalent to an *alignment* type of ``'='`` and a *fill*
|
|
|
|
character of ``'0'``.
|
|
|
|
|
|
|
|
The *precision* is a decimal number indicating how many digits should be
|
Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65012 | jesse.noller | 2008-07-16 15:24:06 +0200 (Wed, 16 Jul 2008) | 2 lines
Apply patch for issue 3090: ARCHFLAGS parsing incorrect
........
r65035 | georg.brandl | 2008-07-16 23:19:28 +0200 (Wed, 16 Jul 2008) | 2 lines
#3045: fix pydoc behavior for TEMP path with spaces.
........
r65037 | georg.brandl | 2008-07-16 23:31:41 +0200 (Wed, 16 Jul 2008) | 2 lines
#1608818: errno can get set by every call to readdir().
........
r65038 | georg.brandl | 2008-07-17 00:04:20 +0200 (Thu, 17 Jul 2008) | 2 lines
#3305: self->stream can be NULL.
........
r65039 | georg.brandl | 2008-07-17 00:09:17 +0200 (Thu, 17 Jul 2008) | 2 lines
#3345: fix docstring.
........
r65040 | georg.brandl | 2008-07-17 00:33:18 +0200 (Thu, 17 Jul 2008) | 2 lines
#3312: fix two sqlite3 crashes.
........
r65048 | georg.brandl | 2008-07-17 01:35:54 +0200 (Thu, 17 Jul 2008) | 2 lines
#3388: add a paragraph about using "with" for file objects.
........
r65057 | gregory.p.smith | 2008-07-17 05:13:05 +0200 (Thu, 17 Jul 2008) | 2 lines
news note for r63052
........
r65077 | jesse.noller | 2008-07-17 23:01:05 +0200 (Thu, 17 Jul 2008) | 3 lines
Fix issue 3395, update _debugInfo to be _debug_info
........
r65091 | ronald.oussoren | 2008-07-18 07:48:03 +0200 (Fri, 18 Jul 2008) | 2 lines
Last bit of a fix for issue3381 (addon for my patch in r65061)
........
r65092 | vinay.sajip | 2008-07-18 10:59:06 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65093 | vinay.sajip | 2008-07-18 11:00:00 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65094 | vinay.sajip | 2008-07-18 11:00:35 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65095 | vinay.sajip | 2008-07-18 11:01:10 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65097 | georg.brandl | 2008-07-18 12:20:59 +0200 (Fri, 18 Jul 2008) | 2 lines
Remove duplicate entry in __all__.
........
r65098 | georg.brandl | 2008-07-18 12:29:30 +0200 (Fri, 18 Jul 2008) | 2 lines
Correct attribute name.
........
r65099 | georg.brandl | 2008-07-18 13:15:06 +0200 (Fri, 18 Jul 2008) | 3 lines
Document the different meaning of precision for {:f} and {:g}.
Also document how inf and nan are formatted. #3404.
........
r65127 | raymond.hettinger | 2008-07-19 02:42:03 +0200 (Sat, 19 Jul 2008) | 1 line
Improve accuracy of gamma test function
........
r65128 | raymond.hettinger | 2008-07-19 02:43:00 +0200 (Sat, 19 Jul 2008) | 1 line
Add recipe to the itertools docs.
........
r65131 | georg.brandl | 2008-07-19 12:08:55 +0200 (Sat, 19 Jul 2008) | 2 lines
#3378: in case of no memory, don't leak even more memory. :)
........
r65133 | georg.brandl | 2008-07-19 14:39:10 +0200 (Sat, 19 Jul 2008) | 3 lines
#3302: fix segfaults when passing None for arguments that can't
be NULL for the C functions.
........
r65134 | georg.brandl | 2008-07-19 14:46:12 +0200 (Sat, 19 Jul 2008) | 2 lines
#3303: fix crash with invalid Py_DECREF in strcoll().
........
r65135 | georg.brandl | 2008-07-19 15:00:22 +0200 (Sat, 19 Jul 2008) | 3 lines
#3319: don't raise ZeroDivisionError if number of rounds is so
low that benchtime is zero.
........
r65136 | georg.brandl | 2008-07-19 15:09:42 +0200 (Sat, 19 Jul 2008) | 3 lines
#3323: mention that if inheriting from a class without __slots__,
the subclass will have a __dict__ available too.
........
r65139 | georg.brandl | 2008-07-19 15:48:44 +0200 (Sat, 19 Jul 2008) | 2 lines
Add ordering info for findall and finditer.
........
r65149 | raymond.hettinger | 2008-07-20 01:21:57 +0200 (Sun, 20 Jul 2008) | 1 line
Fix compress() recipe in docs to use itertools.
........
r65150 | raymond.hettinger | 2008-07-20 01:58:47 +0200 (Sun, 20 Jul 2008) | 1 line
Clean-up itertools docs and recipes.
........
r65151 | gregory.p.smith | 2008-07-20 02:22:08 +0200 (Sun, 20 Jul 2008) | 9 lines
fix issue3120 - don't truncate handles on 64-bit Windows.
This is still messy, realistically PC/_subprocess.c should never cast pointers
to python numbers and back at all.
I don't have a 64-bit windows build environment because microsoft apparently
thinks that should cost money. Time to watch the buildbots. It builds and
passes tests on 32-bit windows.
........
r65155 | georg.brandl | 2008-07-20 13:50:29 +0200 (Sun, 20 Jul 2008) | 2 lines
#926501: add info where to put the docstring.
........
r65158 | neal.norwitz | 2008-07-20 21:35:23 +0200 (Sun, 20 Jul 2008) | 1 line
Fix a couple of names in error messages that were wrong
........
r65159 | neal.norwitz | 2008-07-20 22:39:36 +0200 (Sun, 20 Jul 2008) | 1 line
Fix misspeeld method name (negative)
........
r65176 | amaury.forgeotdarc | 2008-07-21 23:36:24 +0200 (Mon, 21 Jul 2008) | 4 lines
Increment version number in NEWS file, and move items that were added after 2.6b2.
(I thought there was a script to automate this kind of updates)
........
r65177 | amaury.forgeotdarc | 2008-07-22 00:00:38 +0200 (Tue, 22 Jul 2008) | 5 lines
Issue2378: pdb would delete free variables when stepping into a class statement.
The problem was introduced by r53954, the correction is to restore the symmetry between
PyFrame_FastToLocals and PyFrame_LocalsToFast
........
r65178 | benjamin.peterson | 2008-07-22 00:05:34 +0200 (Tue, 22 Jul 2008) | 1 line
don't use assert statement
........
r65183 | ronald.oussoren | 2008-07-22 09:06:00 +0200 (Tue, 22 Jul 2008) | 2 lines
Fix buglet in fix for issue3381
........
r65184 | ronald.oussoren | 2008-07-22 09:06:33 +0200 (Tue, 22 Jul 2008) | 2 lines
Fix build issue on OSX 10.4, somehow this wasn't committed before.
........
r65187 | raymond.hettinger | 2008-07-22 20:54:02 +0200 (Tue, 22 Jul 2008) | 1 line
Remove out-of-date section on Exact/Inexact.
........
r65188 | raymond.hettinger | 2008-07-22 21:00:47 +0200 (Tue, 22 Jul 2008) | 1 line
Tuples now have both count() and index().
........
r65189 | raymond.hettinger | 2008-07-22 21:03:05 +0200 (Tue, 22 Jul 2008) | 1 line
Fix credits for math.sum()
........
r65190 | raymond.hettinger | 2008-07-22 21:18:50 +0200 (Tue, 22 Jul 2008) | 1 line
One more attribution.
........
r65192 | benjamin.peterson | 2008-07-23 01:44:37 +0200 (Wed, 23 Jul 2008) | 1 line
remove unneeded import
........
r65194 | benjamin.peterson | 2008-07-23 15:25:06 +0200 (Wed, 23 Jul 2008) | 1 line
use isinstance
........
2008-07-23 13:10:53 -03:00
|
|
|
displayed after the decimal point for a floating point value formatted with
|
|
|
|
``'f'`` and ``'F'``, or before and after the decimal point for a floating point
|
|
|
|
value formatted with ``'g'`` or ``'G'``. For non-number types the field
|
|
|
|
indicates the maximum field size - in other words, how many characters will be
|
|
|
|
used from the field content. The *precision* is ignored for integer values.
|
2007-08-31 06:22:56 -03:00
|
|
|
|
|
|
|
Finally, the *type* determines how the data should be presented.
|
|
|
|
|
|
|
|
The available integer presentation types are:
|
|
|
|
|
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
| Type | Meaning |
|
|
|
|
+=========+==========================================================+
|
2008-07-15 21:15:35 -03:00
|
|
|
| ``'b'`` | Binary format. Outputs the number in base 2. |
|
2007-08-31 06:22:56 -03:00
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
| ``'c'`` | Character. Converts the integer to the corresponding |
|
|
|
|
| | unicode character before printing. |
|
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
| ``'d'`` | Decimal Integer. Outputs the number in base 10. |
|
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
| ``'o'`` | Octal format. Outputs the number in base 8. |
|
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
| ``'x'`` | Hex format. Outputs the number in base 16, using lower- |
|
|
|
|
| | case letters for the digits above 9. |
|
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
| ``'X'`` | Hex format. Outputs the number in base 16, using upper- |
|
|
|
|
| | case letters for the digits above 9. |
|
|
|
|
+---------+----------------------------------------------------------+
|
2008-05-12 07:01:24 -03:00
|
|
|
| ``'n'`` | Number. This is the same as ``'d'``, except that it uses |
|
|
|
|
| | the current locale setting to insert the appropriate |
|
|
|
|
| | number separator characters. |
|
|
|
|
+---------+----------------------------------------------------------+
|
Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65012 | jesse.noller | 2008-07-16 15:24:06 +0200 (Wed, 16 Jul 2008) | 2 lines
Apply patch for issue 3090: ARCHFLAGS parsing incorrect
........
r65035 | georg.brandl | 2008-07-16 23:19:28 +0200 (Wed, 16 Jul 2008) | 2 lines
#3045: fix pydoc behavior for TEMP path with spaces.
........
r65037 | georg.brandl | 2008-07-16 23:31:41 +0200 (Wed, 16 Jul 2008) | 2 lines
#1608818: errno can get set by every call to readdir().
........
r65038 | georg.brandl | 2008-07-17 00:04:20 +0200 (Thu, 17 Jul 2008) | 2 lines
#3305: self->stream can be NULL.
........
r65039 | georg.brandl | 2008-07-17 00:09:17 +0200 (Thu, 17 Jul 2008) | 2 lines
#3345: fix docstring.
........
r65040 | georg.brandl | 2008-07-17 00:33:18 +0200 (Thu, 17 Jul 2008) | 2 lines
#3312: fix two sqlite3 crashes.
........
r65048 | georg.brandl | 2008-07-17 01:35:54 +0200 (Thu, 17 Jul 2008) | 2 lines
#3388: add a paragraph about using "with" for file objects.
........
r65057 | gregory.p.smith | 2008-07-17 05:13:05 +0200 (Thu, 17 Jul 2008) | 2 lines
news note for r63052
........
r65077 | jesse.noller | 2008-07-17 23:01:05 +0200 (Thu, 17 Jul 2008) | 3 lines
Fix issue 3395, update _debugInfo to be _debug_info
........
r65091 | ronald.oussoren | 2008-07-18 07:48:03 +0200 (Fri, 18 Jul 2008) | 2 lines
Last bit of a fix for issue3381 (addon for my patch in r65061)
........
r65092 | vinay.sajip | 2008-07-18 10:59:06 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65093 | vinay.sajip | 2008-07-18 11:00:00 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65094 | vinay.sajip | 2008-07-18 11:00:35 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65095 | vinay.sajip | 2008-07-18 11:01:10 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65097 | georg.brandl | 2008-07-18 12:20:59 +0200 (Fri, 18 Jul 2008) | 2 lines
Remove duplicate entry in __all__.
........
r65098 | georg.brandl | 2008-07-18 12:29:30 +0200 (Fri, 18 Jul 2008) | 2 lines
Correct attribute name.
........
r65099 | georg.brandl | 2008-07-18 13:15:06 +0200 (Fri, 18 Jul 2008) | 3 lines
Document the different meaning of precision for {:f} and {:g}.
Also document how inf and nan are formatted. #3404.
........
r65127 | raymond.hettinger | 2008-07-19 02:42:03 +0200 (Sat, 19 Jul 2008) | 1 line
Improve accuracy of gamma test function
........
r65128 | raymond.hettinger | 2008-07-19 02:43:00 +0200 (Sat, 19 Jul 2008) | 1 line
Add recipe to the itertools docs.
........
r65131 | georg.brandl | 2008-07-19 12:08:55 +0200 (Sat, 19 Jul 2008) | 2 lines
#3378: in case of no memory, don't leak even more memory. :)
........
r65133 | georg.brandl | 2008-07-19 14:39:10 +0200 (Sat, 19 Jul 2008) | 3 lines
#3302: fix segfaults when passing None for arguments that can't
be NULL for the C functions.
........
r65134 | georg.brandl | 2008-07-19 14:46:12 +0200 (Sat, 19 Jul 2008) | 2 lines
#3303: fix crash with invalid Py_DECREF in strcoll().
........
r65135 | georg.brandl | 2008-07-19 15:00:22 +0200 (Sat, 19 Jul 2008) | 3 lines
#3319: don't raise ZeroDivisionError if number of rounds is so
low that benchtime is zero.
........
r65136 | georg.brandl | 2008-07-19 15:09:42 +0200 (Sat, 19 Jul 2008) | 3 lines
#3323: mention that if inheriting from a class without __slots__,
the subclass will have a __dict__ available too.
........
r65139 | georg.brandl | 2008-07-19 15:48:44 +0200 (Sat, 19 Jul 2008) | 2 lines
Add ordering info for findall and finditer.
........
r65149 | raymond.hettinger | 2008-07-20 01:21:57 +0200 (Sun, 20 Jul 2008) | 1 line
Fix compress() recipe in docs to use itertools.
........
r65150 | raymond.hettinger | 2008-07-20 01:58:47 +0200 (Sun, 20 Jul 2008) | 1 line
Clean-up itertools docs and recipes.
........
r65151 | gregory.p.smith | 2008-07-20 02:22:08 +0200 (Sun, 20 Jul 2008) | 9 lines
fix issue3120 - don't truncate handles on 64-bit Windows.
This is still messy, realistically PC/_subprocess.c should never cast pointers
to python numbers and back at all.
I don't have a 64-bit windows build environment because microsoft apparently
thinks that should cost money. Time to watch the buildbots. It builds and
passes tests on 32-bit windows.
........
r65155 | georg.brandl | 2008-07-20 13:50:29 +0200 (Sun, 20 Jul 2008) | 2 lines
#926501: add info where to put the docstring.
........
r65158 | neal.norwitz | 2008-07-20 21:35:23 +0200 (Sun, 20 Jul 2008) | 1 line
Fix a couple of names in error messages that were wrong
........
r65159 | neal.norwitz | 2008-07-20 22:39:36 +0200 (Sun, 20 Jul 2008) | 1 line
Fix misspeeld method name (negative)
........
r65176 | amaury.forgeotdarc | 2008-07-21 23:36:24 +0200 (Mon, 21 Jul 2008) | 4 lines
Increment version number in NEWS file, and move items that were added after 2.6b2.
(I thought there was a script to automate this kind of updates)
........
r65177 | amaury.forgeotdarc | 2008-07-22 00:00:38 +0200 (Tue, 22 Jul 2008) | 5 lines
Issue2378: pdb would delete free variables when stepping into a class statement.
The problem was introduced by r53954, the correction is to restore the symmetry between
PyFrame_FastToLocals and PyFrame_LocalsToFast
........
r65178 | benjamin.peterson | 2008-07-22 00:05:34 +0200 (Tue, 22 Jul 2008) | 1 line
don't use assert statement
........
r65183 | ronald.oussoren | 2008-07-22 09:06:00 +0200 (Tue, 22 Jul 2008) | 2 lines
Fix buglet in fix for issue3381
........
r65184 | ronald.oussoren | 2008-07-22 09:06:33 +0200 (Tue, 22 Jul 2008) | 2 lines
Fix build issue on OSX 10.4, somehow this wasn't committed before.
........
r65187 | raymond.hettinger | 2008-07-22 20:54:02 +0200 (Tue, 22 Jul 2008) | 1 line
Remove out-of-date section on Exact/Inexact.
........
r65188 | raymond.hettinger | 2008-07-22 21:00:47 +0200 (Tue, 22 Jul 2008) | 1 line
Tuples now have both count() and index().
........
r65189 | raymond.hettinger | 2008-07-22 21:03:05 +0200 (Tue, 22 Jul 2008) | 1 line
Fix credits for math.sum()
........
r65190 | raymond.hettinger | 2008-07-22 21:18:50 +0200 (Tue, 22 Jul 2008) | 1 line
One more attribution.
........
r65192 | benjamin.peterson | 2008-07-23 01:44:37 +0200 (Wed, 23 Jul 2008) | 1 line
remove unneeded import
........
r65194 | benjamin.peterson | 2008-07-23 15:25:06 +0200 (Wed, 23 Jul 2008) | 1 line
use isinstance
........
2008-07-23 13:10:53 -03:00
|
|
|
| None | The same as ``'d'``. |
|
2007-08-31 06:22:56 -03:00
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
|
|
|
|
The available presentation types for floating point and decimal values are:
|
|
|
|
|
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
| Type | Meaning |
|
|
|
|
+=========+==========================================================+
|
|
|
|
| ``'e'`` | Exponent notation. Prints the number in scientific |
|
|
|
|
| | notation using the letter 'e' to indicate the exponent. |
|
|
|
|
+---------+----------------------------------------------------------+
|
2008-07-17 16:18:29 -03:00
|
|
|
| ``'E'`` | Exponent notation. Same as ``'e'`` except it uses an |
|
|
|
|
| | upper case 'E' as the separator character. |
|
2007-08-31 06:22:56 -03:00
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
| ``'f'`` | Fixed point. Displays the number as a fixed-point |
|
|
|
|
| | number. |
|
|
|
|
+---------+----------------------------------------------------------+
|
2008-07-17 16:18:29 -03:00
|
|
|
| ``'F'`` | Fixed point. Same as ``'f'``. |
|
2007-08-31 06:22:56 -03:00
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
| ``'g'`` | General format. This prints the number as a fixed-point |
|
|
|
|
| | number, unless the number is too large, in which case |
|
Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65012 | jesse.noller | 2008-07-16 15:24:06 +0200 (Wed, 16 Jul 2008) | 2 lines
Apply patch for issue 3090: ARCHFLAGS parsing incorrect
........
r65035 | georg.brandl | 2008-07-16 23:19:28 +0200 (Wed, 16 Jul 2008) | 2 lines
#3045: fix pydoc behavior for TEMP path with spaces.
........
r65037 | georg.brandl | 2008-07-16 23:31:41 +0200 (Wed, 16 Jul 2008) | 2 lines
#1608818: errno can get set by every call to readdir().
........
r65038 | georg.brandl | 2008-07-17 00:04:20 +0200 (Thu, 17 Jul 2008) | 2 lines
#3305: self->stream can be NULL.
........
r65039 | georg.brandl | 2008-07-17 00:09:17 +0200 (Thu, 17 Jul 2008) | 2 lines
#3345: fix docstring.
........
r65040 | georg.brandl | 2008-07-17 00:33:18 +0200 (Thu, 17 Jul 2008) | 2 lines
#3312: fix two sqlite3 crashes.
........
r65048 | georg.brandl | 2008-07-17 01:35:54 +0200 (Thu, 17 Jul 2008) | 2 lines
#3388: add a paragraph about using "with" for file objects.
........
r65057 | gregory.p.smith | 2008-07-17 05:13:05 +0200 (Thu, 17 Jul 2008) | 2 lines
news note for r63052
........
r65077 | jesse.noller | 2008-07-17 23:01:05 +0200 (Thu, 17 Jul 2008) | 3 lines
Fix issue 3395, update _debugInfo to be _debug_info
........
r65091 | ronald.oussoren | 2008-07-18 07:48:03 +0200 (Fri, 18 Jul 2008) | 2 lines
Last bit of a fix for issue3381 (addon for my patch in r65061)
........
r65092 | vinay.sajip | 2008-07-18 10:59:06 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65093 | vinay.sajip | 2008-07-18 11:00:00 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65094 | vinay.sajip | 2008-07-18 11:00:35 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65095 | vinay.sajip | 2008-07-18 11:01:10 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65097 | georg.brandl | 2008-07-18 12:20:59 +0200 (Fri, 18 Jul 2008) | 2 lines
Remove duplicate entry in __all__.
........
r65098 | georg.brandl | 2008-07-18 12:29:30 +0200 (Fri, 18 Jul 2008) | 2 lines
Correct attribute name.
........
r65099 | georg.brandl | 2008-07-18 13:15:06 +0200 (Fri, 18 Jul 2008) | 3 lines
Document the different meaning of precision for {:f} and {:g}.
Also document how inf and nan are formatted. #3404.
........
r65127 | raymond.hettinger | 2008-07-19 02:42:03 +0200 (Sat, 19 Jul 2008) | 1 line
Improve accuracy of gamma test function
........
r65128 | raymond.hettinger | 2008-07-19 02:43:00 +0200 (Sat, 19 Jul 2008) | 1 line
Add recipe to the itertools docs.
........
r65131 | georg.brandl | 2008-07-19 12:08:55 +0200 (Sat, 19 Jul 2008) | 2 lines
#3378: in case of no memory, don't leak even more memory. :)
........
r65133 | georg.brandl | 2008-07-19 14:39:10 +0200 (Sat, 19 Jul 2008) | 3 lines
#3302: fix segfaults when passing None for arguments that can't
be NULL for the C functions.
........
r65134 | georg.brandl | 2008-07-19 14:46:12 +0200 (Sat, 19 Jul 2008) | 2 lines
#3303: fix crash with invalid Py_DECREF in strcoll().
........
r65135 | georg.brandl | 2008-07-19 15:00:22 +0200 (Sat, 19 Jul 2008) | 3 lines
#3319: don't raise ZeroDivisionError if number of rounds is so
low that benchtime is zero.
........
r65136 | georg.brandl | 2008-07-19 15:09:42 +0200 (Sat, 19 Jul 2008) | 3 lines
#3323: mention that if inheriting from a class without __slots__,
the subclass will have a __dict__ available too.
........
r65139 | georg.brandl | 2008-07-19 15:48:44 +0200 (Sat, 19 Jul 2008) | 2 lines
Add ordering info for findall and finditer.
........
r65149 | raymond.hettinger | 2008-07-20 01:21:57 +0200 (Sun, 20 Jul 2008) | 1 line
Fix compress() recipe in docs to use itertools.
........
r65150 | raymond.hettinger | 2008-07-20 01:58:47 +0200 (Sun, 20 Jul 2008) | 1 line
Clean-up itertools docs and recipes.
........
r65151 | gregory.p.smith | 2008-07-20 02:22:08 +0200 (Sun, 20 Jul 2008) | 9 lines
fix issue3120 - don't truncate handles on 64-bit Windows.
This is still messy, realistically PC/_subprocess.c should never cast pointers
to python numbers and back at all.
I don't have a 64-bit windows build environment because microsoft apparently
thinks that should cost money. Time to watch the buildbots. It builds and
passes tests on 32-bit windows.
........
r65155 | georg.brandl | 2008-07-20 13:50:29 +0200 (Sun, 20 Jul 2008) | 2 lines
#926501: add info where to put the docstring.
........
r65158 | neal.norwitz | 2008-07-20 21:35:23 +0200 (Sun, 20 Jul 2008) | 1 line
Fix a couple of names in error messages that were wrong
........
r65159 | neal.norwitz | 2008-07-20 22:39:36 +0200 (Sun, 20 Jul 2008) | 1 line
Fix misspeeld method name (negative)
........
r65176 | amaury.forgeotdarc | 2008-07-21 23:36:24 +0200 (Mon, 21 Jul 2008) | 4 lines
Increment version number in NEWS file, and move items that were added after 2.6b2.
(I thought there was a script to automate this kind of updates)
........
r65177 | amaury.forgeotdarc | 2008-07-22 00:00:38 +0200 (Tue, 22 Jul 2008) | 5 lines
Issue2378: pdb would delete free variables when stepping into a class statement.
The problem was introduced by r53954, the correction is to restore the symmetry between
PyFrame_FastToLocals and PyFrame_LocalsToFast
........
r65178 | benjamin.peterson | 2008-07-22 00:05:34 +0200 (Tue, 22 Jul 2008) | 1 line
don't use assert statement
........
r65183 | ronald.oussoren | 2008-07-22 09:06:00 +0200 (Tue, 22 Jul 2008) | 2 lines
Fix buglet in fix for issue3381
........
r65184 | ronald.oussoren | 2008-07-22 09:06:33 +0200 (Tue, 22 Jul 2008) | 2 lines
Fix build issue on OSX 10.4, somehow this wasn't committed before.
........
r65187 | raymond.hettinger | 2008-07-22 20:54:02 +0200 (Tue, 22 Jul 2008) | 1 line
Remove out-of-date section on Exact/Inexact.
........
r65188 | raymond.hettinger | 2008-07-22 21:00:47 +0200 (Tue, 22 Jul 2008) | 1 line
Tuples now have both count() and index().
........
r65189 | raymond.hettinger | 2008-07-22 21:03:05 +0200 (Tue, 22 Jul 2008) | 1 line
Fix credits for math.sum()
........
r65190 | raymond.hettinger | 2008-07-22 21:18:50 +0200 (Tue, 22 Jul 2008) | 1 line
One more attribution.
........
r65192 | benjamin.peterson | 2008-07-23 01:44:37 +0200 (Wed, 23 Jul 2008) | 1 line
remove unneeded import
........
r65194 | benjamin.peterson | 2008-07-23 15:25:06 +0200 (Wed, 23 Jul 2008) | 1 line
use isinstance
........
2008-07-23 13:10:53 -03:00
|
|
|
| | it switches to ``'e'`` exponent notation. Infinity and |
|
|
|
|
| | NaN values are formatted as ``inf``, ``-inf`` and |
|
|
|
|
| | ``nan``, respectively. |
|
2007-08-31 06:22:56 -03:00
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
| ``'G'`` | General format. Same as ``'g'`` except switches to |
|
Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65012 | jesse.noller | 2008-07-16 15:24:06 +0200 (Wed, 16 Jul 2008) | 2 lines
Apply patch for issue 3090: ARCHFLAGS parsing incorrect
........
r65035 | georg.brandl | 2008-07-16 23:19:28 +0200 (Wed, 16 Jul 2008) | 2 lines
#3045: fix pydoc behavior for TEMP path with spaces.
........
r65037 | georg.brandl | 2008-07-16 23:31:41 +0200 (Wed, 16 Jul 2008) | 2 lines
#1608818: errno can get set by every call to readdir().
........
r65038 | georg.brandl | 2008-07-17 00:04:20 +0200 (Thu, 17 Jul 2008) | 2 lines
#3305: self->stream can be NULL.
........
r65039 | georg.brandl | 2008-07-17 00:09:17 +0200 (Thu, 17 Jul 2008) | 2 lines
#3345: fix docstring.
........
r65040 | georg.brandl | 2008-07-17 00:33:18 +0200 (Thu, 17 Jul 2008) | 2 lines
#3312: fix two sqlite3 crashes.
........
r65048 | georg.brandl | 2008-07-17 01:35:54 +0200 (Thu, 17 Jul 2008) | 2 lines
#3388: add a paragraph about using "with" for file objects.
........
r65057 | gregory.p.smith | 2008-07-17 05:13:05 +0200 (Thu, 17 Jul 2008) | 2 lines
news note for r63052
........
r65077 | jesse.noller | 2008-07-17 23:01:05 +0200 (Thu, 17 Jul 2008) | 3 lines
Fix issue 3395, update _debugInfo to be _debug_info
........
r65091 | ronald.oussoren | 2008-07-18 07:48:03 +0200 (Fri, 18 Jul 2008) | 2 lines
Last bit of a fix for issue3381 (addon for my patch in r65061)
........
r65092 | vinay.sajip | 2008-07-18 10:59:06 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65093 | vinay.sajip | 2008-07-18 11:00:00 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65094 | vinay.sajip | 2008-07-18 11:00:35 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65095 | vinay.sajip | 2008-07-18 11:01:10 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65097 | georg.brandl | 2008-07-18 12:20:59 +0200 (Fri, 18 Jul 2008) | 2 lines
Remove duplicate entry in __all__.
........
r65098 | georg.brandl | 2008-07-18 12:29:30 +0200 (Fri, 18 Jul 2008) | 2 lines
Correct attribute name.
........
r65099 | georg.brandl | 2008-07-18 13:15:06 +0200 (Fri, 18 Jul 2008) | 3 lines
Document the different meaning of precision for {:f} and {:g}.
Also document how inf and nan are formatted. #3404.
........
r65127 | raymond.hettinger | 2008-07-19 02:42:03 +0200 (Sat, 19 Jul 2008) | 1 line
Improve accuracy of gamma test function
........
r65128 | raymond.hettinger | 2008-07-19 02:43:00 +0200 (Sat, 19 Jul 2008) | 1 line
Add recipe to the itertools docs.
........
r65131 | georg.brandl | 2008-07-19 12:08:55 +0200 (Sat, 19 Jul 2008) | 2 lines
#3378: in case of no memory, don't leak even more memory. :)
........
r65133 | georg.brandl | 2008-07-19 14:39:10 +0200 (Sat, 19 Jul 2008) | 3 lines
#3302: fix segfaults when passing None for arguments that can't
be NULL for the C functions.
........
r65134 | georg.brandl | 2008-07-19 14:46:12 +0200 (Sat, 19 Jul 2008) | 2 lines
#3303: fix crash with invalid Py_DECREF in strcoll().
........
r65135 | georg.brandl | 2008-07-19 15:00:22 +0200 (Sat, 19 Jul 2008) | 3 lines
#3319: don't raise ZeroDivisionError if number of rounds is so
low that benchtime is zero.
........
r65136 | georg.brandl | 2008-07-19 15:09:42 +0200 (Sat, 19 Jul 2008) | 3 lines
#3323: mention that if inheriting from a class without __slots__,
the subclass will have a __dict__ available too.
........
r65139 | georg.brandl | 2008-07-19 15:48:44 +0200 (Sat, 19 Jul 2008) | 2 lines
Add ordering info for findall and finditer.
........
r65149 | raymond.hettinger | 2008-07-20 01:21:57 +0200 (Sun, 20 Jul 2008) | 1 line
Fix compress() recipe in docs to use itertools.
........
r65150 | raymond.hettinger | 2008-07-20 01:58:47 +0200 (Sun, 20 Jul 2008) | 1 line
Clean-up itertools docs and recipes.
........
r65151 | gregory.p.smith | 2008-07-20 02:22:08 +0200 (Sun, 20 Jul 2008) | 9 lines
fix issue3120 - don't truncate handles on 64-bit Windows.
This is still messy, realistically PC/_subprocess.c should never cast pointers
to python numbers and back at all.
I don't have a 64-bit windows build environment because microsoft apparently
thinks that should cost money. Time to watch the buildbots. It builds and
passes tests on 32-bit windows.
........
r65155 | georg.brandl | 2008-07-20 13:50:29 +0200 (Sun, 20 Jul 2008) | 2 lines
#926501: add info where to put the docstring.
........
r65158 | neal.norwitz | 2008-07-20 21:35:23 +0200 (Sun, 20 Jul 2008) | 1 line
Fix a couple of names in error messages that were wrong
........
r65159 | neal.norwitz | 2008-07-20 22:39:36 +0200 (Sun, 20 Jul 2008) | 1 line
Fix misspeeld method name (negative)
........
r65176 | amaury.forgeotdarc | 2008-07-21 23:36:24 +0200 (Mon, 21 Jul 2008) | 4 lines
Increment version number in NEWS file, and move items that were added after 2.6b2.
(I thought there was a script to automate this kind of updates)
........
r65177 | amaury.forgeotdarc | 2008-07-22 00:00:38 +0200 (Tue, 22 Jul 2008) | 5 lines
Issue2378: pdb would delete free variables when stepping into a class statement.
The problem was introduced by r53954, the correction is to restore the symmetry between
PyFrame_FastToLocals and PyFrame_LocalsToFast
........
r65178 | benjamin.peterson | 2008-07-22 00:05:34 +0200 (Tue, 22 Jul 2008) | 1 line
don't use assert statement
........
r65183 | ronald.oussoren | 2008-07-22 09:06:00 +0200 (Tue, 22 Jul 2008) | 2 lines
Fix buglet in fix for issue3381
........
r65184 | ronald.oussoren | 2008-07-22 09:06:33 +0200 (Tue, 22 Jul 2008) | 2 lines
Fix build issue on OSX 10.4, somehow this wasn't committed before.
........
r65187 | raymond.hettinger | 2008-07-22 20:54:02 +0200 (Tue, 22 Jul 2008) | 1 line
Remove out-of-date section on Exact/Inexact.
........
r65188 | raymond.hettinger | 2008-07-22 21:00:47 +0200 (Tue, 22 Jul 2008) | 1 line
Tuples now have both count() and index().
........
r65189 | raymond.hettinger | 2008-07-22 21:03:05 +0200 (Tue, 22 Jul 2008) | 1 line
Fix credits for math.sum()
........
r65190 | raymond.hettinger | 2008-07-22 21:18:50 +0200 (Tue, 22 Jul 2008) | 1 line
One more attribution.
........
r65192 | benjamin.peterson | 2008-07-23 01:44:37 +0200 (Wed, 23 Jul 2008) | 1 line
remove unneeded import
........
r65194 | benjamin.peterson | 2008-07-23 15:25:06 +0200 (Wed, 23 Jul 2008) | 1 line
use isinstance
........
2008-07-23 13:10:53 -03:00
|
|
|
| | ``'E'`` if the number gets to large. The representations |
|
|
|
|
| | of infinity and NaN are uppercased, too. |
|
2007-08-31 06:22:56 -03:00
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
| ``'n'`` | Number. This is the same as ``'g'``, except that it uses |
|
|
|
|
| | the current locale setting to insert the appropriate |
|
|
|
|
| | number separator characters. |
|
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
| ``'%'`` | Percentage. Multiplies the number by 100 and displays |
|
|
|
|
| | in fixed (``'f'``) format, followed by a percent sign. |
|
|
|
|
+---------+----------------------------------------------------------+
|
Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65012 | jesse.noller | 2008-07-16 15:24:06 +0200 (Wed, 16 Jul 2008) | 2 lines
Apply patch for issue 3090: ARCHFLAGS parsing incorrect
........
r65035 | georg.brandl | 2008-07-16 23:19:28 +0200 (Wed, 16 Jul 2008) | 2 lines
#3045: fix pydoc behavior for TEMP path with spaces.
........
r65037 | georg.brandl | 2008-07-16 23:31:41 +0200 (Wed, 16 Jul 2008) | 2 lines
#1608818: errno can get set by every call to readdir().
........
r65038 | georg.brandl | 2008-07-17 00:04:20 +0200 (Thu, 17 Jul 2008) | 2 lines
#3305: self->stream can be NULL.
........
r65039 | georg.brandl | 2008-07-17 00:09:17 +0200 (Thu, 17 Jul 2008) | 2 lines
#3345: fix docstring.
........
r65040 | georg.brandl | 2008-07-17 00:33:18 +0200 (Thu, 17 Jul 2008) | 2 lines
#3312: fix two sqlite3 crashes.
........
r65048 | georg.brandl | 2008-07-17 01:35:54 +0200 (Thu, 17 Jul 2008) | 2 lines
#3388: add a paragraph about using "with" for file objects.
........
r65057 | gregory.p.smith | 2008-07-17 05:13:05 +0200 (Thu, 17 Jul 2008) | 2 lines
news note for r63052
........
r65077 | jesse.noller | 2008-07-17 23:01:05 +0200 (Thu, 17 Jul 2008) | 3 lines
Fix issue 3395, update _debugInfo to be _debug_info
........
r65091 | ronald.oussoren | 2008-07-18 07:48:03 +0200 (Fri, 18 Jul 2008) | 2 lines
Last bit of a fix for issue3381 (addon for my patch in r65061)
........
r65092 | vinay.sajip | 2008-07-18 10:59:06 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65093 | vinay.sajip | 2008-07-18 11:00:00 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65094 | vinay.sajip | 2008-07-18 11:00:35 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65095 | vinay.sajip | 2008-07-18 11:01:10 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65097 | georg.brandl | 2008-07-18 12:20:59 +0200 (Fri, 18 Jul 2008) | 2 lines
Remove duplicate entry in __all__.
........
r65098 | georg.brandl | 2008-07-18 12:29:30 +0200 (Fri, 18 Jul 2008) | 2 lines
Correct attribute name.
........
r65099 | georg.brandl | 2008-07-18 13:15:06 +0200 (Fri, 18 Jul 2008) | 3 lines
Document the different meaning of precision for {:f} and {:g}.
Also document how inf and nan are formatted. #3404.
........
r65127 | raymond.hettinger | 2008-07-19 02:42:03 +0200 (Sat, 19 Jul 2008) | 1 line
Improve accuracy of gamma test function
........
r65128 | raymond.hettinger | 2008-07-19 02:43:00 +0200 (Sat, 19 Jul 2008) | 1 line
Add recipe to the itertools docs.
........
r65131 | georg.brandl | 2008-07-19 12:08:55 +0200 (Sat, 19 Jul 2008) | 2 lines
#3378: in case of no memory, don't leak even more memory. :)
........
r65133 | georg.brandl | 2008-07-19 14:39:10 +0200 (Sat, 19 Jul 2008) | 3 lines
#3302: fix segfaults when passing None for arguments that can't
be NULL for the C functions.
........
r65134 | georg.brandl | 2008-07-19 14:46:12 +0200 (Sat, 19 Jul 2008) | 2 lines
#3303: fix crash with invalid Py_DECREF in strcoll().
........
r65135 | georg.brandl | 2008-07-19 15:00:22 +0200 (Sat, 19 Jul 2008) | 3 lines
#3319: don't raise ZeroDivisionError if number of rounds is so
low that benchtime is zero.
........
r65136 | georg.brandl | 2008-07-19 15:09:42 +0200 (Sat, 19 Jul 2008) | 3 lines
#3323: mention that if inheriting from a class without __slots__,
the subclass will have a __dict__ available too.
........
r65139 | georg.brandl | 2008-07-19 15:48:44 +0200 (Sat, 19 Jul 2008) | 2 lines
Add ordering info for findall and finditer.
........
r65149 | raymond.hettinger | 2008-07-20 01:21:57 +0200 (Sun, 20 Jul 2008) | 1 line
Fix compress() recipe in docs to use itertools.
........
r65150 | raymond.hettinger | 2008-07-20 01:58:47 +0200 (Sun, 20 Jul 2008) | 1 line
Clean-up itertools docs and recipes.
........
r65151 | gregory.p.smith | 2008-07-20 02:22:08 +0200 (Sun, 20 Jul 2008) | 9 lines
fix issue3120 - don't truncate handles on 64-bit Windows.
This is still messy, realistically PC/_subprocess.c should never cast pointers
to python numbers and back at all.
I don't have a 64-bit windows build environment because microsoft apparently
thinks that should cost money. Time to watch the buildbots. It builds and
passes tests on 32-bit windows.
........
r65155 | georg.brandl | 2008-07-20 13:50:29 +0200 (Sun, 20 Jul 2008) | 2 lines
#926501: add info where to put the docstring.
........
r65158 | neal.norwitz | 2008-07-20 21:35:23 +0200 (Sun, 20 Jul 2008) | 1 line
Fix a couple of names in error messages that were wrong
........
r65159 | neal.norwitz | 2008-07-20 22:39:36 +0200 (Sun, 20 Jul 2008) | 1 line
Fix misspeeld method name (negative)
........
r65176 | amaury.forgeotdarc | 2008-07-21 23:36:24 +0200 (Mon, 21 Jul 2008) | 4 lines
Increment version number in NEWS file, and move items that were added after 2.6b2.
(I thought there was a script to automate this kind of updates)
........
r65177 | amaury.forgeotdarc | 2008-07-22 00:00:38 +0200 (Tue, 22 Jul 2008) | 5 lines
Issue2378: pdb would delete free variables when stepping into a class statement.
The problem was introduced by r53954, the correction is to restore the symmetry between
PyFrame_FastToLocals and PyFrame_LocalsToFast
........
r65178 | benjamin.peterson | 2008-07-22 00:05:34 +0200 (Tue, 22 Jul 2008) | 1 line
don't use assert statement
........
r65183 | ronald.oussoren | 2008-07-22 09:06:00 +0200 (Tue, 22 Jul 2008) | 2 lines
Fix buglet in fix for issue3381
........
r65184 | ronald.oussoren | 2008-07-22 09:06:33 +0200 (Tue, 22 Jul 2008) | 2 lines
Fix build issue on OSX 10.4, somehow this wasn't committed before.
........
r65187 | raymond.hettinger | 2008-07-22 20:54:02 +0200 (Tue, 22 Jul 2008) | 1 line
Remove out-of-date section on Exact/Inexact.
........
r65188 | raymond.hettinger | 2008-07-22 21:00:47 +0200 (Tue, 22 Jul 2008) | 1 line
Tuples now have both count() and index().
........
r65189 | raymond.hettinger | 2008-07-22 21:03:05 +0200 (Tue, 22 Jul 2008) | 1 line
Fix credits for math.sum()
........
r65190 | raymond.hettinger | 2008-07-22 21:18:50 +0200 (Tue, 22 Jul 2008) | 1 line
One more attribution.
........
r65192 | benjamin.peterson | 2008-07-23 01:44:37 +0200 (Wed, 23 Jul 2008) | 1 line
remove unneeded import
........
r65194 | benjamin.peterson | 2008-07-23 15:25:06 +0200 (Wed, 23 Jul 2008) | 1 line
use isinstance
........
2008-07-23 13:10:53 -03:00
|
|
|
| None | The same as ``'g'``. |
|
2007-08-31 06:22:56 -03:00
|
|
|
+---------+----------------------------------------------------------+
|
|
|
|
|
|
|
|
|
|
|
|
.. _template-strings:
|
|
|
|
|
2007-08-15 11:28:22 -03:00
|
|
|
Template strings
|
|
|
|
----------------
|
|
|
|
|
|
|
|
Templates provide simpler string substitutions as described in :pep:`292`.
|
|
|
|
Instead of the normal ``%``\ -based substitutions, Templates support ``$``\
|
|
|
|
-based substitutions, using the following rules:
|
|
|
|
|
|
|
|
* ``$$`` is an escape; it is replaced with a single ``$``.
|
|
|
|
|
|
|
|
* ``$identifier`` names a substitution placeholder matching a mapping key of
|
|
|
|
``"identifier"``. By default, ``"identifier"`` must spell a Python
|
|
|
|
identifier. The first non-identifier character after the ``$`` character
|
|
|
|
terminates this placeholder specification.
|
|
|
|
|
|
|
|
* ``${identifier}`` is equivalent to ``$identifier``. It is required when valid
|
|
|
|
identifier characters follow the placeholder but are not part of the
|
|
|
|
placeholder, such as ``"${noun}ification"``.
|
|
|
|
|
|
|
|
Any other appearance of ``$`` in the string will result in a :exc:`ValueError`
|
|
|
|
being raised.
|
|
|
|
|
|
|
|
The :mod:`string` module provides a :class:`Template` class that implements
|
|
|
|
these rules. The methods of :class:`Template` are:
|
|
|
|
|
|
|
|
|
|
|
|
.. class:: Template(template)
|
|
|
|
|
|
|
|
The constructor takes a single argument which is the template string.
|
|
|
|
|
|
|
|
|
2008-04-24 22:59:09 -03:00
|
|
|
.. method:: substitute(mapping[, **kws])
|
2007-08-15 11:28:22 -03:00
|
|
|
|
2008-04-24 22:59:09 -03:00
|
|
|
Performs the template substitution, returning a new string. *mapping* is
|
|
|
|
any dictionary-like object with keys that match the placeholders in the
|
|
|
|
template. Alternatively, you can provide keyword arguments, where the
|
|
|
|
keywords are the placeholders. When both *mapping* and *kws* are given
|
|
|
|
and there are duplicates, the placeholders from *kws* take precedence.
|
2007-08-15 11:28:22 -03:00
|
|
|
|
|
|
|
|
2008-04-24 22:59:09 -03:00
|
|
|
.. method:: safe_substitute(mapping[, **kws])
|
2007-08-15 11:28:22 -03:00
|
|
|
|
2008-04-24 22:59:09 -03:00
|
|
|
Like :meth:`substitute`, except that if placeholders are missing from
|
|
|
|
*mapping* and *kws*, instead of raising a :exc:`KeyError` exception, the
|
|
|
|
original placeholder will appear in the resulting string intact. Also,
|
|
|
|
unlike with :meth:`substitute`, any other appearances of the ``$`` will
|
|
|
|
simply return ``$`` instead of raising :exc:`ValueError`.
|
2007-08-15 11:28:22 -03:00
|
|
|
|
2008-04-24 22:59:09 -03:00
|
|
|
While other exceptions may still occur, this method is called "safe"
|
|
|
|
because substitutions always tries to return a usable string instead of
|
|
|
|
raising an exception. In another sense, :meth:`safe_substitute` may be
|
|
|
|
anything other than safe, since it will silently ignore malformed
|
|
|
|
templates containing dangling delimiters, unmatched braces, or
|
|
|
|
placeholders that are not valid Python identifiers.
|
2007-08-15 11:28:22 -03:00
|
|
|
|
|
|
|
:class:`Template` instances also provide one public data attribute:
|
|
|
|
|
|
|
|
|
|
|
|
.. attribute:: string.template
|
|
|
|
|
|
|
|
This is the object passed to the constructor's *template* argument. In general,
|
|
|
|
you shouldn't change it, but read-only access is not enforced.
|
|
|
|
|
Merged revisions 61724-61725,61731-61735,61737,61739,61741,61743-61744,61753,61761,61765-61767,61769,61773,61776-61778,61780-61783,61788,61793,61796,61807,61813 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r61724 | martin.v.loewis | 2008-03-22 01:01:12 +0100 (Sat, 22 Mar 2008) | 49 lines
Merged revisions 61602-61723 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r61626 | david.wolever | 2008-03-19 17:19:16 +0100 (Mi, 19 M?\195?\164r 2008) | 1 line
Added fixer for implicit local imports. See #2414.
........
r61628 | david.wolever | 2008-03-19 17:57:43 +0100 (Mi, 19 M?\195?\164r 2008) | 1 line
Added a class for tests which should not run if a particular import is found.
........
r61629 | collin.winter | 2008-03-19 17:58:19 +0100 (Mi, 19 M?\195?\164r 2008) | 1 line
Two more relative import fixes in pgen2.
........
r61635 | david.wolever | 2008-03-19 20:16:03 +0100 (Mi, 19 M?\195?\164r 2008) | 1 line
Fixed print fixer so it will do the Right Thing when it encounters __future__.print_function. 2to3 gets upset, though, so the tests have been commented out.
........
r61637 | david.wolever | 2008-03-19 21:37:17 +0100 (Mi, 19 M?\195?\164r 2008) | 3 lines
Added a fixer for itertools imports (from itertools import imap, ifilterfalse --> from itertools import filterfalse)
........
r61645 | david.wolever | 2008-03-19 23:22:35 +0100 (Mi, 19 M?\195?\164r 2008) | 1 line
SVN is happier when you add the files you create... -_-'
........
r61654 | david.wolever | 2008-03-20 01:09:56 +0100 (Do, 20 M?\195?\164r 2008) | 1 line
Added an explicit sort order to fixers -- fixes problems like #2427
........
r61664 | david.wolever | 2008-03-20 04:32:40 +0100 (Do, 20 M?\195?\164r 2008) | 3 lines
Fixes #2428 -- comments are no longer eatten by __future__ fixer.
........
r61673 | david.wolever | 2008-03-20 17:22:40 +0100 (Do, 20 M?\195?\164r 2008) | 1 line
Added 2to3 node pretty-printer
........
r61679 | david.wolever | 2008-03-20 20:50:42 +0100 (Do, 20 M?\195?\164r 2008) | 1 line
Made node printing a little bit prettier
........
r61723 | martin.v.loewis | 2008-03-22 00:59:27 +0100 (Sa, 22 M?\195?\164r 2008) | 2 lines
Fix whitespace.
........
................
r61725 | martin.v.loewis | 2008-03-22 01:02:41 +0100 (Sat, 22 Mar 2008) | 2 lines
Install lib2to3.
................
r61731 | facundo.batista | 2008-03-22 03:45:37 +0100 (Sat, 22 Mar 2008) | 4 lines
Small fix that complicated the test actually when that
test failed.
................
r61732 | alexandre.vassalotti | 2008-03-22 05:08:44 +0100 (Sat, 22 Mar 2008) | 2 lines
Added warning for the removal of 'hotshot' in Py3k.
................
r61733 | georg.brandl | 2008-03-22 11:07:29 +0100 (Sat, 22 Mar 2008) | 4 lines
#1918: document that weak references *to* an object are
cleared before the object's __del__ is called, to ensure that the weak
reference callback (if any) finds the object healthy.
................
r61734 | georg.brandl | 2008-03-22 11:56:23 +0100 (Sat, 22 Mar 2008) | 2 lines
Activate the Sphinx doctest extension and convert howto/functional to use it.
................
r61735 | georg.brandl | 2008-03-22 11:58:38 +0100 (Sat, 22 Mar 2008) | 2 lines
Allow giving source names on the cmdline.
................
r61737 | georg.brandl | 2008-03-22 12:00:48 +0100 (Sat, 22 Mar 2008) | 2 lines
Fixup this HOWTO's doctest blocks so that they can be run with sphinx' doctest builder.
................
r61739 | georg.brandl | 2008-03-22 12:47:10 +0100 (Sat, 22 Mar 2008) | 2 lines
Test decimal.rst doctests as far as possible with sphinx doctest.
................
r61741 | georg.brandl | 2008-03-22 13:04:26 +0100 (Sat, 22 Mar 2008) | 2 lines
Make doctests in re docs usable with sphinx' doctest.
................
r61743 | georg.brandl | 2008-03-22 13:59:37 +0100 (Sat, 22 Mar 2008) | 2 lines
Make more doctests in pprint docs testable.
................
r61744 | georg.brandl | 2008-03-22 14:07:06 +0100 (Sat, 22 Mar 2008) | 2 lines
No need to specify explicit "doctest_block" anymore.
................
r61753 | georg.brandl | 2008-03-22 21:08:43 +0100 (Sat, 22 Mar 2008) | 2 lines
Fix-up syntax problems.
................
r61761 | georg.brandl | 2008-03-22 22:06:20 +0100 (Sat, 22 Mar 2008) | 4 lines
Make collections' doctests executable.
(The <BLANKLINE>s will be stripped from presentation output.)
................
r61765 | georg.brandl | 2008-03-22 22:21:57 +0100 (Sat, 22 Mar 2008) | 2 lines
Test doctests in datetime docs.
................
r61766 | georg.brandl | 2008-03-22 22:26:44 +0100 (Sat, 22 Mar 2008) | 2 lines
Test doctests in operator docs.
................
r61767 | georg.brandl | 2008-03-22 22:38:33 +0100 (Sat, 22 Mar 2008) | 2 lines
Enable doctests in functions.rst. Already found two errors :)
................
r61769 | georg.brandl | 2008-03-22 23:04:10 +0100 (Sat, 22 Mar 2008) | 3 lines
Enable doctest running for several other documents.
We have now over 640 doctests that are run with "make doctest".
................
r61773 | raymond.hettinger | 2008-03-23 01:55:46 +0100 (Sun, 23 Mar 2008) | 1 line
Simplify demo code.
................
r61776 | neal.norwitz | 2008-03-23 04:43:33 +0100 (Sun, 23 Mar 2008) | 7 lines
Try to make this test a little more robust and not fail with:
timeout (10.0025) is more than 2 seconds more than expected (0.001)
I'm assuming this problem is caused by DNS lookup. This change
does a DNS lookup of the hostname before trying to connect, so the time
is not included.
................
r61777 | neal.norwitz | 2008-03-23 05:08:30 +0100 (Sun, 23 Mar 2008) | 1 line
Speed up the test by avoiding socket timeouts.
................
r61778 | neal.norwitz | 2008-03-23 05:43:09 +0100 (Sun, 23 Mar 2008) | 1 line
Skip the epoll test if epoll() does not work
................
r61780 | neal.norwitz | 2008-03-23 06:47:20 +0100 (Sun, 23 Mar 2008) | 1 line
Suppress failure (to avoid a flaky test) if we cannot connect to svn.python.org
................
r61781 | neal.norwitz | 2008-03-23 07:13:25 +0100 (Sun, 23 Mar 2008) | 4 lines
Move itertools before future_builtins since the latter depends on the former.
From a clean build importing future_builtins would fail since itertools
wasn't built yet.
................
r61782 | neal.norwitz | 2008-03-23 07:16:04 +0100 (Sun, 23 Mar 2008) | 1 line
Try to prevent the alarm going off early in tearDown
................
r61783 | neal.norwitz | 2008-03-23 07:19:57 +0100 (Sun, 23 Mar 2008) | 4 lines
Remove compiler warnings (on Alpha at least) about using chars as
array subscripts. Using chars are dangerous b/c they are signed
on some platforms and unsigned on others.
................
r61788 | georg.brandl | 2008-03-23 09:05:30 +0100 (Sun, 23 Mar 2008) | 2 lines
Make the doctests presentation-friendlier.
................
r61793 | amaury.forgeotdarc | 2008-03-23 10:55:29 +0100 (Sun, 23 Mar 2008) | 4 lines
#1477: ur'\U0010FFFF' raised in narrow unicode builds.
Corrected the raw-unicode-escape codec to use UTF-16 surrogates in
this case, just like the unicode-escape codec.
................
r61796 | raymond.hettinger | 2008-03-23 14:32:32 +0100 (Sun, 23 Mar 2008) | 1 line
Issue 1681432: Add triangular distribution the random module.
................
r61807 | raymond.hettinger | 2008-03-23 20:37:53 +0100 (Sun, 23 Mar 2008) | 4 lines
Adopt Nick's suggestion for useful default arguments.
Clean-up floating point issues by adding true division and float constants.
................
r61813 | gregory.p.smith | 2008-03-23 22:04:43 +0100 (Sun, 23 Mar 2008) | 6 lines
Fix gzip to deal with CRC's being signed values in Python 2.x properly and to
read 32bit values as unsigned to start with rather than applying signedness
fixups allover the place afterwards.
This hopefully fixes the test_tarfile failure on the alpha/tru64 buildbot.
................
2008-03-23 18:54:12 -03:00
|
|
|
Here is an example of how to use a Template:
|
2007-08-15 11:28:22 -03:00
|
|
|
|
|
|
|
>>> from string import Template
|
|
|
|
>>> s = Template('$who likes $what')
|
|
|
|
>>> s.substitute(who='tim', what='kung pao')
|
|
|
|
'tim likes kung pao'
|
|
|
|
>>> d = dict(who='tim')
|
|
|
|
>>> Template('Give $who $100').substitute(d)
|
|
|
|
Traceback (most recent call last):
|
|
|
|
[...]
|
|
|
|
ValueError: Invalid placeholder in string: line 1, col 10
|
|
|
|
>>> Template('$who likes $what').substitute(d)
|
|
|
|
Traceback (most recent call last):
|
|
|
|
[...]
|
|
|
|
KeyError: 'what'
|
|
|
|
>>> Template('$who likes $what').safe_substitute(d)
|
|
|
|
'tim likes $what'
|
|
|
|
|
|
|
|
Advanced usage: you can derive subclasses of :class:`Template` to customize the
|
|
|
|
placeholder syntax, delimiter character, or the entire regular expression used
|
|
|
|
to parse template strings. To do this, you can override these class attributes:
|
|
|
|
|
|
|
|
* *delimiter* -- This is the literal string describing a placeholder introducing
|
|
|
|
delimiter. The default value ``$``. Note that this should *not* be a regular
|
|
|
|
expression, as the implementation will call :meth:`re.escape` on this string as
|
|
|
|
needed.
|
|
|
|
|
|
|
|
* *idpattern* -- This is the regular expression describing the pattern for
|
|
|
|
non-braced placeholders (the braces will be added automatically as
|
|
|
|
appropriate). The default value is the regular expression
|
|
|
|
``[_a-z][_a-z0-9]*``.
|
|
|
|
|
|
|
|
Alternatively, you can provide the entire regular expression pattern by
|
|
|
|
overriding the class attribute *pattern*. If you do this, the value must be a
|
|
|
|
regular expression object with four named capturing groups. The capturing
|
|
|
|
groups correspond to the rules given above, along with the invalid placeholder
|
|
|
|
rule:
|
|
|
|
|
|
|
|
* *escaped* -- This group matches the escape sequence, e.g. ``$$``, in the
|
|
|
|
default pattern.
|
|
|
|
|
|
|
|
* *named* -- This group matches the unbraced placeholder name; it should not
|
|
|
|
include the delimiter in capturing group.
|
|
|
|
|
|
|
|
* *braced* -- This group matches the brace enclosed placeholder name; it should
|
|
|
|
not include either the delimiter or braces in the capturing group.
|
|
|
|
|
|
|
|
* *invalid* -- This group matches any other delimiter pattern (usually a single
|
|
|
|
delimiter), and it should appear last in the regular expression.
|
|
|
|
|
|
|
|
|
|
|
|
String functions
|
|
|
|
----------------
|
|
|
|
|
2008-02-01 07:56:49 -04:00
|
|
|
The following functions are available to operate on string objects.
|
2007-08-15 11:28:22 -03:00
|
|
|
They are not available as string methods.
|
|
|
|
|
|
|
|
|
|
|
|
.. function:: capwords(s)
|
|
|
|
|
|
|
|
Split the argument into words using :func:`split`, capitalize each word using
|
|
|
|
:func:`capitalize`, and join the capitalized words using :func:`join`. Note
|
|
|
|
that this replaces runs of whitespace characters by a single space, and removes
|
|
|
|
leading and trailing whitespace.
|
|
|
|
|
|
|
|
|
2007-08-31 07:37:15 -03:00
|
|
|
.. function:: maketrans(frm, to)
|
2007-08-15 11:28:22 -03:00
|
|
|
|
2007-08-31 07:37:15 -03:00
|
|
|
Return a translation table suitable for passing to :meth:`bytes.translate`,
|
|
|
|
that will map each character in *from* into the character at the same
|
|
|
|
position in *to*; *from* and *to* must have the same length.
|