Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 63397,63673 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63397 | benjamin.peterson | 2008-05-16 17:59:28 -0500 (Fri, 16 May 2008) | 2 lines

  mention Py3k in glossary
........
  r63673 | benjamin.peterson | 2008-05-26 07:29:46 -0500 (Mon, 26 May 2008) | 2 lines

  some updates to string formatting section in whatsnew
........
This commit is contained in:
Benjamin Peterson 2008-05-26 12:52:02 +00:00
parent c5595728af
commit 1e2f050a79
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Doc/glossary.rst
View File

@ -371,8 +371,9 @@ Glossary
:term:`argument`.
Python 3000
Nickname for the Python 3.x release line (coined long ago when the
release of version 3 was something in the distant future.)
Nickname for the Python 3.x release line (coined long ago when the release
of version 3 was something in the distant future.) This is also
abbreviated "Py3k".
Pythonic
An idea or piece of code which closely follows the most common idioms of

11
Doc/whatsnew/2.6.rst
View File

@ -526,9 +526,9 @@ environment variable.
PEP 3101: Advanced String Formatting
=====================================================
In Python 3.0, the `%` operator is supplemented by a more powerful
string formatting method, :meth:`format`. Support for the
:meth:`format` method has been backported to Python 2.6.
In Python 3.0, the `%` operator is supplemented by a more powerful string
formatting method, :meth:`format`. Support for the :meth:`str.format` method
has been backported to Python 2.6.
In 2.6, both 8-bit and Unicode strings have a `.format()` method that
treats the string as a template and takes the arguments to be formatted.
@ -650,8 +650,11 @@ the type's :meth:`__format__` method with the provided specifier::
.. seealso::
:ref:`formatstrings`
The reference format fields.
:pep:`3101` - Advanced String Formatting
PEP written by Talin.
PEP written by Talin. Implemented by Eric Smith.
.. ======================================================================