Remove trailing whitespace.
diff --git a/Doc/whatsnew/2.0.rst b/Doc/whatsnew/2.0.rst
index 9ea5dc1..75205d4 100644
--- a/Doc/whatsnew/2.0.rst
+++ b/Doc/whatsnew/2.0.rst
@@ -1,5 +1,5 @@
****************************
- What's New in Python 2.0
+ What's New in Python 2.0
****************************
:Author: A.M. Kuchling and Moshe Zadka
@@ -277,9 +277,9 @@
finding all the strings in the list containing a given substring. You could
write the following to do it::
- # Given the list L, make a list of all strings
+ # Given the list L, make a list of all strings
# containing the substring S.
- sublist = filter( lambda s, substring=S:
+ sublist = filter( lambda s, substring=S:
string.find(s, substring) != -1,
L)
@@ -291,7 +291,7 @@
List comprehensions have the form::
- [ expression for expr in sequence1
+ [ expression for expr in sequence1
for expr2 in sequence2 ...
for exprN in sequenceN
if condition ]
@@ -312,8 +312,8 @@
...
for exprN in sequenceN:
if (condition):
- # Append the value of
- # the expression to the
+ # Append the value of
+ # the expression to the
# resulting list.
This means that when there are multiple :keyword:`for`...\ :keyword:`in`
@@ -590,7 +590,7 @@
def f():
print "i=",i
- i = i + 1
+ i = i + 1
f()
Two new exceptions, :exc:`TabError` and :exc:`IndentationError`, have been
@@ -627,7 +627,7 @@
the following lines of code::
if dict.has_key( key ): return dict[key]
- else:
+ else:
dict[key] = []
return dict[key]
@@ -836,14 +836,14 @@
:file:`setup.py` can be just a few lines long::
from distutils.core import setup
- setup (name = "foo", version = "1.0",
+ setup (name = "foo", version = "1.0",
py_modules = ["module1", "module2"])
The :file:`setup.py` file isn't much more complicated if the software consists
of a few packages::
from distutils.core import setup
- setup (name = "foo", version = "1.0",
+ setup (name = "foo", version = "1.0",
packages = ["package", "package.subpackage"])
A C extension can be the most complicated case; here's an example taken from
@@ -860,7 +860,7 @@
'extensions/expat/xmltok/xmlrole.c',
]
)
- setup (name = "PyXML", version = "0.5.4",
+ setup (name = "PyXML", version = "0.5.4",
ext_modules =[ expat_extension ] )
The Distutils can also take care of creating source and binary distributions.
diff --git a/Doc/whatsnew/2.1.rst b/Doc/whatsnew/2.1.rst
index c3f1280..6b2ce3f 100644
--- a/Doc/whatsnew/2.1.rst
+++ b/Doc/whatsnew/2.1.rst
@@ -1,5 +1,5 @@
****************************
- What's New in Python 2.1
+ What's New in Python 2.1
****************************
:Author: A.M. Kuchling
@@ -98,7 +98,7 @@
x = 1
def f():
# The next line is a syntax error
- exec 'x=2'
+ exec 'x=2'
def g():
return x
diff --git a/Doc/whatsnew/2.2.rst b/Doc/whatsnew/2.2.rst
index 1383298..28ecb81 100644
--- a/Doc/whatsnew/2.2.rst
+++ b/Doc/whatsnew/2.2.rst
@@ -1,5 +1,5 @@
****************************
- What's New in Python 2.2
+ What's New in Python 2.2
****************************
:Author: A.M. Kuchling
@@ -473,7 +473,7 @@
Traceback (most recent call last):
File "<stdin>", line 1, in ?
StopIteration
- >>>
+ >>>
In 2.2, Python's :keyword:`for` statement no longer expects a sequence; it
expects something for which :func:`iter` will return an iterator. For backward
@@ -909,7 +909,7 @@
x = 1
def f():
# The next line is a syntax error
- exec 'x=2'
+ exec 'x=2'
def g():
return x
@@ -952,8 +952,8 @@
items = s.meerkat.getItems( {'channel': 4} )
# 'items' is another list of dictionaries, like this:
- # [{'link': 'http://freshmeat.net/releases/52719/',
- # 'description': 'A utility which converts HTML to XSL FO.',
+ # [{'link': 'http://freshmeat.net/releases/52719/',
+ # 'description': 'A utility which converts HTML to XSL FO.',
# 'title': 'html2fo 0.3 (Default)'}, ... ]
The :mod:`SimpleXMLRPCServer` module makes it easy to create straightforward
diff --git a/Doc/whatsnew/2.3.rst b/Doc/whatsnew/2.3.rst
index 810aa25..fd0f77f 100644
--- a/Doc/whatsnew/2.3.rst
+++ b/Doc/whatsnew/2.3.rst
@@ -1,5 +1,5 @@
****************************
- What's New in Python 2.3
+ What's New in Python 2.3
****************************
:Author: A.M. Kuchling
@@ -301,7 +301,7 @@
-------- -------
8467 1 file
amk@nyman:~/src/python$ ./python
- Python 2.3 (#1, Aug 1 2003, 19:54:32)
+ Python 2.3 (#1, Aug 1 2003, 19:54:32)
>>> import sys
>>> sys.path.insert(0, '/tmp/example.zip') # Add .zip file to front of path
>>> import jwzthreading
@@ -671,7 +671,7 @@
# ...
}
- if (hasattr(core, 'setup_keywords') and
+ if (hasattr(core, 'setup_keywords') and
'classifiers' in core.setup_keywords):
kw['classifiers'] = \
['Topic :: Internet :: WWW/HTTP :: Dynamic Content',
@@ -1027,7 +1027,7 @@
creating small dictionaries::
>>> dict(red=1, blue=2, green=3, black=4)
- {'blue': 2, 'black': 4, 'green': 3, 'red': 1}
+ {'blue': 2, 'black': 4, 'green': 3, 'red': 1}
(Contributed by Just van Rossum.)
@@ -1622,7 +1622,7 @@
... self.valuelist.pop(i)
... def keys(self):
... return list(self.keylist)
- ...
+ ...
>>> s = SeqDict()
>>> dir(s) # See that other dictionary methods are implemented
['__cmp__', '__contains__', '__delitem__', '__doc__', '__getitem__',
@@ -1779,7 +1779,7 @@
set input filename
-lLENGTH, --length=LENGTH
set maximum length of output
- $
+ $
See the module's documentation for more details.
diff --git a/Doc/whatsnew/2.4.rst b/Doc/whatsnew/2.4.rst
index 59788ba..d608c2b 100644
--- a/Doc/whatsnew/2.4.rst
+++ b/Doc/whatsnew/2.4.rst
@@ -1,5 +1,5 @@
****************************
- What's New in Python 2.4
+ What's New in Python 2.4
****************************
:Author: A.M. Kuchling
@@ -63,10 +63,10 @@
>>> a.add('z') # add a new element
>>> a.update('wxy') # add multiple new elements
>>> a
- set(['a', 'c', 'b', 'd', 'r', 'w', 'y', 'x', 'z'])
+ set(['a', 'c', 'b', 'd', 'r', 'w', 'y', 'x', 'z'])
>>> a.remove('x') # take one element out
>>> a
- set(['a', 'c', 'b', 'd', 'r', 'w', 'y', 'z'])
+ set(['a', 'c', 'b', 'd', 'r', 'w', 'y', 'z'])
The :func:`frozenset` type is an immutable version of :func:`set`. Since it is
immutable and hashable, it may be used as a dictionary key or as a member of
@@ -351,7 +351,7 @@
>>> for i in reversed(xrange(1,4)):
... print i
- ...
+ ...
3
2
1
@@ -366,7 +366,7 @@
>>> input = open('/etc/passwd', 'r')
>>> for line in reversed(list(input)):
... print line
- ...
+ ...
root:*:0:0:System Administrator:/var/root:/bin/tcsh
...
@@ -650,7 +650,7 @@
28
>>> decimal.Decimal(1) / decimal.Decimal(7)
Decimal("0.1428571428571428571428571429")
- >>> decimal.getcontext().prec = 9
+ >>> decimal.getcontext().prec = 9
>>> decimal.Decimal(1) / decimal.Decimal(7)
Decimal("0.142857143")
@@ -665,7 +665,7 @@
>>> decimal.getcontext().traps[decimal.DivisionByZero] = False
>>> decimal.Decimal(1) / decimal.Decimal(0)
Decimal("Infinity")
- >>>
+ >>>
The :class:`Context` instance also has various methods for formatting numbers
such as :meth:`to_eng_string` and :meth:`to_sci_string`.
@@ -803,7 +803,7 @@
>>> 'www.python.org'.split('.', 1)
['www', 'python.org']
'www.python.org'.rsplit('.', 1)
- ['www.python', 'org']
+ ['www.python', 'org']
* Three keyword parameters, *cmp*, *key*, and *reverse*, were added to the
:meth:`sort` method of lists. These parameters make some common usages of
@@ -1045,7 +1045,7 @@
>>> list(d) # list the contents of the deque
['g', 'h', 'i']
>>> 'h' in d # search the deque
- True
+ True
Several modules, such as the :mod:`Queue` and :mod:`threading` modules, now take
advantage of :class:`collections.deque` for improved performance. (Contributed
@@ -1106,13 +1106,13 @@
>>> L = [2, 4, 6, 7, 8, 9, 11, 12, 14]
>>> for key_val, it in itertools.groupby(L, lambda x: x % 2):
... print key_val, list(it)
- ...
+ ...
0 [2, 4, 6]
1 [7]
0 [8]
1 [9, 11]
0 [12, 14]
- >>>
+ >>>
:func:`groupby` is typically used with sorted input. The logic for
:func:`groupby` is similar to the Unix ``uniq`` filter which makes it handy for
@@ -1120,21 +1120,21 @@
>>> word = 'abracadabra'
>>> letters = sorted(word) # Turn string into a sorted list of letters
- >>> letters
+ >>> letters
['a', 'a', 'a', 'a', 'a', 'b', 'b', 'c', 'd', 'r', 'r']
>>> for k, g in itertools.groupby(letters):
... print k, list(g)
- ...
+ ...
a ['a', 'a', 'a', 'a', 'a']
b ['b', 'b']
c ['c']
d ['d']
r ['r', 'r']
>>> # List unique letters
- >>> [k for k, g in groupby(letters)]
+ >>> [k for k, g in groupby(letters)]
['a', 'b', 'c', 'd', 'r']
>>> # Count letter occurrences
- >>> [(k, len(list(g))) for k, g in groupby(letters)]
+ >>> [(k, len(list(g))) for k, g in groupby(letters)]
[('a', 5), ('b', 2), ('c', 1), ('d', 1), ('r', 2)]
(Contributed by Hye-Shik Chang.)
@@ -1175,7 +1175,7 @@
import logging
logging.basicConfig(filename='/var/log/application.log',
level=0, # Log all messages
- format='%(levelname):%(process):%(thread):%(message)')
+ format='%(levelname):%(process):%(thread):%(message)')
Other additions to the :mod:`logging` package include a :meth:`log(level, msg)`
convenience method, as well as a :class:`TimedRotatingFileHandler` class that
diff --git a/Doc/whatsnew/2.5.rst b/Doc/whatsnew/2.5.rst
index 43ba6e5..16350ac 100644
--- a/Doc/whatsnew/2.5.rst
+++ b/Doc/whatsnew/2.5.rst
@@ -1,5 +1,5 @@
****************************
- What's New in Python 2.5
+ What's New in Python 2.5
****************************
:Author: A.M. Kuchling
@@ -220,7 +220,7 @@
required packages. ::
VERSION = '1.0'
- setup(name='PyPackage',
+ setup(name='PyPackage',
version=VERSION,
requires=['numarray', 'zlib (>=1.1.4)'],
obsoletes=['OldPackage']
@@ -388,7 +388,7 @@
else:
else-block
finally:
- final-block
+ final-block
The code in *block-1* is executed. If the code raises an exception, the various
:keyword:`except` blocks are tested: if the exception is of class
@@ -835,8 +835,8 @@
...
except (KeyboardInterrupt, SystemExit):
raise
- except:
- # Log error...
+ except:
+ # Log error...
# Continue running program...
In Python 2.5, you can now write ``except Exception`` to achieve the same
@@ -947,7 +947,7 @@
class C:
def __index__ (self):
- return self.value
+ return self.value
The return value must be either a Python integer or long integer. The
interpreter will check that the type returned is correct, and raises a
@@ -1035,9 +1035,9 @@
L = ['medium', 'longest', 'short']
# Prints 'longest'
- print max(L, key=len)
+ print max(L, key=len)
# Prints 'short', because lexicographically 'short' has the largest value
- print max(L)
+ print max(L)
(Contributed by Steven Bethard and Raymond Hettinger.)
@@ -1070,8 +1070,8 @@
using the default ASCII encoding. The result of the comparison is false::
>>> chr(128) == unichr(128) # Can't convert chr(128) to Unicode
- __main__:1: UnicodeWarning: Unicode equal comparison failed
- to convert both arguments to Unicode - interpreting them
+ __main__:1: UnicodeWarning: Unicode equal comparison failed
+ to convert both arguments to Unicode - interpreting them
as being unequal
False
>>> chr(127) == unichr(127) # chr(127) can be converted
@@ -1259,10 +1259,10 @@
Printing ``index`` results in the following output::
- defaultdict(<type 'list'>, {'c': ['cammin', 'che'], 'e': ['era'],
- 'd': ['del', 'di', 'diritta'], 'm': ['mezzo', 'mi'],
- 'l': ['la'], 'o': ['oscura'], 'n': ['nel', 'nostra'],
- 'p': ['per'], 's': ['selva', 'smarrita'],
+ defaultdict(<type 'list'>, {'c': ['cammin', 'che'], 'e': ['era'],
+ 'd': ['del', 'di', 'diritta'], 'm': ['mezzo', 'mi'],
+ 'l': ['la'], 'o': ['oscura'], 'n': ['nel', 'nostra'],
+ 'p': ['per'], 's': ['selva', 'smarrita'],
'r': ['ritrovai'], 'u': ['una'], 'v': ['vita', 'via']}
(Contributed by Guido van Rossum.)
@@ -1884,17 +1884,17 @@
differently. ::
# Old versions
- h = md5.md5()
- h = md5.new()
+ h = md5.md5()
+ h = md5.new()
- # New version
+ # New version
h = hashlib.md5()
# Old versions
- h = sha.sha()
- h = sha.new()
+ h = sha.sha()
+ h = sha.new()
- # New version
+ # New version
h = hashlib.sha1()
# Hash that weren't previously available
@@ -2191,7 +2191,7 @@
case that your extensions were using it, you can replace it by something like
the following::
- range = PyObject_CallFunction((PyObject*) &PyRange_Type, "lll",
+ range = PyObject_CallFunction((PyObject*) &PyRange_Type, "lll",
start, stop, step);
.. ======================================================================
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 @@
>>> 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 @@
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 @@
"/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 @@
* 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 @@
: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 @@
``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 @@
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 @@
: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 @@
(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 @@
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 @@
* :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 @@
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.
diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst
index 678ad80..fcdca04 100644
--- a/Doc/whatsnew/3.0.rst
+++ b/Doc/whatsnew/3.0.rst
@@ -1,5 +1,5 @@
****************************
- What's New In Python 3.0
+ What's New In Python 3.0
****************************
.. XXX Add trademark info for Apple, Microsoft.
@@ -10,45 +10,45 @@
.. $Id$
Rules for maintenance:
-
+
* Anyone can add text to this document. Do not spend very much time
on the wording of your changes, because your text will probably
get rewritten to some degree.
-
+
* The maintainer will go through Misc/NEWS periodically and add
changes; it's therefore more important to add your changes to
Misc/NEWS than to this file. (Note: I didn't get to this for 3.0.
GvR.)
-
+
* This is not a complete list of every single change; completeness
is the purpose of Misc/NEWS. Some changes I consider too small
or esoteric to include. If such a change is added to the text,
I'll just remove it. (This is another reason you shouldn't spend
too much time on writing your addition.)
-
+
* If you want to draw your new text to the attention of the
maintainer, add 'XXX' to the beginning of the paragraph or
section.
-
+
* It's OK to just add a fragmentary note about a change. For
example: "XXX Describe the transmogrify() function added to the
socket module." The maintainer will research the change and
write the necessary text.
-
+
* You can comment out your additions if you like, but it's not
necessary (especially when a final release is some months away).
-
+
* Credit the author of a patch or bugfix. Just the name is
sufficient; the e-mail address isn't necessary. (Due to time
constraints I haven't managed to do this for 3.0. GvR.)
-
+
* It's helpful to add the bug/patch number as a comment:
-
+
% Patch 12345
XXX Describe the transmogrify() function added to the socket
module.
(Contributed by P.Y. Developer.)
-
+
This saves the maintainer the effort of going through the SVN log
when researching a change. (Again, I didn't get to this for 3.0.
GvR.)
@@ -819,7 +819,7 @@
need it; however, 99 percent of the time an explicit :keyword:`for`
loop is more readable.
-* Removed :func:`reload`. Use :func:`imp.reload`.
+* Removed :func:`reload`. Use :func:`imp.reload`.
* Removed. :meth:`dict.has_key` -- use the :keyword:`in` operator
instead.
diff --git a/Doc/whatsnew/3.1.rst b/Doc/whatsnew/3.1.rst
index 7df4d1e..68a76f3 100644
--- a/Doc/whatsnew/3.1.rst
+++ b/Doc/whatsnew/3.1.rst
@@ -1,5 +1,5 @@
****************************
- What's New In Python 3.1
+ What's New In Python 3.1
****************************
.. XXX Add trademark info for Apple, Microsoft.
@@ -10,45 +10,45 @@
.. $Id$
Rules for maintenance:
-
+
* Anyone can add text to this document. Do not spend very much time
on the wording of your changes, because your text will probably
get rewritten to some degree.
-
+
* The maintainer will go through Misc/NEWS periodically and add
changes; it's therefore more important to add your changes to
Misc/NEWS than to this file. (Note: I didn't get to this for 3.0.
GvR.)
-
+
* This is not a complete list of every single change; completeness
is the purpose of Misc/NEWS. Some changes I consider too small
or esoteric to include. If such a change is added to the text,
I'll just remove it. (This is another reason you shouldn't spend
too much time on writing your addition.)
-
+
* If you want to draw your new text to the attention of the
maintainer, add 'XXX' to the beginning of the paragraph or
section.
-
+
* It's OK to just add a fragmentary note about a change. For
example: "XXX Describe the transmogrify() function added to the
socket module." The maintainer will research the change and
write the necessary text.
-
+
* You can comment out your additions if you like, but it's not
necessary (especially when a final release is some months away).
-
+
* Credit the author of a patch or bugfix. Just the name is
sufficient; the e-mail address isn't necessary. (Due to time
constraints I haven't managed to do this for 3.0. GvR.)
-
+
* It's helpful to add the bug/patch number as a comment:
-
+
% Patch 12345
XXX Describe the transmogrify() function added to the socket
module.
(Contributed by P.Y. Developer.)
-
+
This saves the maintainer the effort of going through the SVN log
when researching a change. (Again, I didn't get to this for 3.0.
GvR.)