summaryrefslogtreecommitdiffstats
path: root/Doc/whatsnew/2.6.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-01-03 21:18:54 (GMT)
committerGeorg Brandl <georg@python.org>2009-01-03 21:18:54 (GMT)
commit48310cd3f2e02ced9ae836ccbcb67e9af3097d62 (patch)
tree04c86b387c11bfd4835a320e76bbb2ee24626e0d /Doc/whatsnew/2.6.rst
parent3d3558a4653fcfcbdcbb75bda5d61e93c48f4d51 (diff)
downloadcpython-48310cd3f2e02ced9ae836ccbcb67e9af3097d62.zip
cpython-48310cd3f2e02ced9ae836ccbcb67e9af3097d62.tar.gz
cpython-48310cd3f2e02ced9ae836ccbcb67e9af3097d62.tar.bz2
Remove trailing whitespace.
Diffstat (limited to 'Doc/whatsnew/2.6.rst')
-rw-r--r--Doc/whatsnew/2.6.rst38
1 files changed, 19 insertions, 19 deletions
diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index d9a1993..750f7db 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -748,7 +748,7 @@ supply compound field names that read attributes or access dictionary keys::
>>> import sys
>>> print 'Platform: {0.platform}\nPython version: {0.version}'.format(sys)
Platform: darwin
- Python version: 2.6a1+ (trunk:61261M, Mar 5 2008, 20:29:41)
+ Python version: 2.6a1+ (trunk:61261M, Mar 5 2008, 20:29:41)
[GCC 4.0.1 (Apple Computer, Inc. build 5367)]'
>>> import mimetypes
@@ -962,8 +962,8 @@ representing ``ABC``; in 2.6, ``bytes([65, 66, 67])`` returns the
The primary use of :class:`bytes` in 2.6 will be to write tests of
object type such as ``isinstance(x, bytes)``. This will help the 2to3
converter, which can't tell whether 2.x code intends strings to
-contain either characters or 8-bit bytes; you can now
-use either :class:`bytes` or :class:`str` to represent your intention
+contain either characters or 8-bit bytes; you can now
+use either :class:`bytes` or :class:`str` to represent your intention
exactly, and the resulting code will also be correct in Python 3.0.
There's also a ``__future__`` import that causes all string literals
@@ -1838,9 +1838,9 @@ changes, or look through the Subversion logs for all the details.
"/cgi-bin/add.py?category=1". (Contributed by Alexandre Fiori and
Nubis; :issue:`1817`.)
- The :func:`parse_qs` and :func:`parse_qsl` functions have been
+ The :func:`parse_qs` and :func:`parse_qsl` functions have been
relocated from the :mod:`cgi` module to the :mod:`urlparse` module.
- The versions still available in the :mod:`cgi` module will
+ The versions still available in the :mod:`cgi` module will
trigger :exc:`PendingDeprecationWarning` messages in 2.6
(:issue:`600362`).
@@ -1935,7 +1935,7 @@ changes, or look through the Subversion logs for all the details.
* A new window method in the :mod:`curses` module,
:meth:`chgat`, changes the display attributes for a certain number of
characters on a single line. (Contributed by Fabian Kreutz.)
-
+
::
# Boldface text starting at y=0,x=21
@@ -2432,9 +2432,9 @@ changes, or look through the Subversion logs for all the details.
:issue:`742598`, :issue:`1193577`.)
* The :mod:`sqlite3` module, maintained by Gerhard Haering,
- has been updated from version 2.3.2 in Python 2.5 to
+ has been updated from version 2.3.2 in Python 2.5 to
version 2.4.1.
-
+
* The :mod:`struct` module now supports the C99 :ctype:`_Bool` type,
using the format character ``'?'``.
(Contributed by David Remahl.)
@@ -2529,9 +2529,9 @@ changes, or look through the Subversion logs for all the details.
``with tempfile.NamedTemporaryFile() as tmp: ...``.
(Contributed by Alexander Belopolsky; :issue:`2021`.)
-* The :mod:`test.test_support` module gained a number
- of context managers useful for writing tests.
- :func:`EnvironmentVarGuard` is a
+* The :mod:`test.test_support` module gained a number
+ of context managers useful for writing tests.
+ :func:`EnvironmentVarGuard` is a
context manager that temporarily changes environment variables and
automatically restores them to their old values.
@@ -2546,7 +2546,7 @@ changes, or look through the Subversion logs for all the details.
f = urllib.urlopen('https://sf.net')
...
- Finally, :func:`check_warnings` resets the :mod:`warning` module's
+ Finally, :func:`check_warnings` resets the :mod:`warning` module's
warning filters and returns an object that will record all warning
messages triggered (:issue:`3781`)::
@@ -2586,7 +2586,7 @@ changes, or look through the Subversion logs for all the details.
:meth:`activeCount` method is renamed to :meth:`active_count`. Both
the 2.6 and 3.0 versions of the module support the same properties
and renamed methods, but don't remove the old methods. No date has been set
- for the deprecation of the old APIs in Python 3.x; the old APIs won't
+ for the deprecation of the old APIs in Python 3.x; the old APIs won't
be removed in any 2.x version.
(Carried out by several people, most notably Benjamin Peterson.)
@@ -2643,7 +2643,7 @@ changes, or look through the Subversion logs for all the details.
(Added by Facundo Batista.)
* The Unicode database provided by the :mod:`unicodedata` module
- has been updated to version 5.1.0. (Updated by
+ has been updated to version 5.1.0. (Updated by
Martin von Loewis; :issue:`3811`.)
* The :mod:`warnings` module's :func:`formatwarning` and :func:`showwarning`
@@ -2654,7 +2654,7 @@ changes, or look through the Subversion logs for all the details.
A new function, :func:`catch_warnings`, is a context manager
intended for testing purposes that lets you temporarily modify the
warning filters and then restore their original values (:issue:`3781`).
-
+
* The XML-RPC :class:`SimpleXMLRPCServer` and :class:`DocXMLRPCServer`
classes can now be prevented from immediately opening and binding to
their socket by passing True as the ``bind_and_activate``
@@ -3224,8 +3224,8 @@ that may require changes to your code:
* :meth:`object.__init__` previously accepted arbitrary arguments and
keyword arguments, ignoring them. In Python 2.6, this is no longer
- allowed and will result in a :exc:`TypeError`. This will affect
- :meth:`__init__` methods that end up calling the corresponding
+ allowed and will result in a :exc:`TypeError`. This will affect
+ :meth:`__init__` methods that end up calling the corresponding
method on :class:`object` (perhaps through using :func:`super`).
See :issue:`1683368` for discussion.
@@ -3285,7 +3285,7 @@ Acknowledgements
The author would like to thank the following people for offering
suggestions, corrections and assistance with various drafts of this
-article: Georg Brandl, Steve Brown, Nick Coghlan, Ralph Corderoy,
-Jim Jewett, Kent Johnson, Chris Lambacher, Martin Michlmayr,
+article: Georg Brandl, Steve Brown, Nick Coghlan, Ralph Corderoy,
+Jim Jewett, Kent Johnson, Chris Lambacher, Martin Michlmayr,
Antoine Pitrou, Brian Warner.