[Python-checkins] cpython (merge 3.3 -> default): Removed spaces before commas and periods.
serhiy.storchaka
python-checkins at python.org
Mon Dec 23 17:22:25 CET 2013
http://hg.python.org/cpython/rev/26c938374e2e
changeset: 88152:26c938374e2e
parent: 88149:f670d8db8ef3
parent: 88151:86e54df4312a
user: Serhiy Storchaka <storchaka at gmail.com>
date: Mon Dec 23 18:21:57 2013 +0200
summary:
Removed spaces before commas and periods.
files:
Doc/faq/library.rst | 2 +-
Doc/howto/pyporting.rst | 2 +-
Doc/howto/urllib2.rst | 2 +-
Doc/library/ctypes.rst | 2 +-
Doc/library/http.cookiejar.rst | 2 +-
Doc/library/itertools.rst | 4 ++--
Doc/library/logging.rst | 2 +-
Doc/library/ossaudiodev.rst | 2 +-
Doc/library/pyexpat.rst | 2 +-
Doc/library/re.rst | 2 +-
Doc/library/stdtypes.rst | 2 +-
Doc/library/sys.rst | 2 +-
Doc/library/tkinter.rst | 4 ++--
Doc/library/trace.rst | 2 +-
Doc/library/urllib.request.rst | 2 +-
Doc/library/xml.dom.minidom.rst | 2 +-
Doc/reference/import.rst | 2 +-
Doc/whatsnew/3.2.rst | 2 +-
Doc/whatsnew/3.3.rst | 2 +-
Doc/whatsnew/3.4.rst | 2 +-
20 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/Doc/faq/library.rst b/Doc/faq/library.rst
--- a/Doc/faq/library.rst
+++ b/Doc/faq/library.rst
@@ -662,7 +662,7 @@
.. XXX check if wiki page is still up to date
A summary of available frameworks is maintained by Paul Boddie at
-http://wiki.python.org/moin/WebProgramming .
+http://wiki.python.org/moin/WebProgramming\ .
Cameron Laird maintains a useful set of pages about Python web technologies at
http://phaseit.net/claird/comp.lang.python/web_python.
diff --git a/Doc/howto/pyporting.rst b/Doc/howto/pyporting.rst
--- a/Doc/howto/pyporting.rst
+++ b/Doc/howto/pyporting.rst
@@ -640,7 +640,7 @@
To get a complete idea of what issues you will need to deal with, see the
`What's New in Python 3.0`_. Others have reorganized the data in other formats
-such as http://docs.pythonsprints.com/python3_porting/py-porting.html .
+such as http://docs.pythonsprints.com/python3_porting/py-porting.html\ .
The following are some steps to take to try to support both Python 2 & 3 from
the same source code.
diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst
--- a/Doc/howto/urllib2.rst
+++ b/Doc/howto/urllib2.rst
@@ -160,7 +160,7 @@
to your HTTP request.
Some websites [#]_ dislike being browsed by programs, or send different versions
-to different browsers [#]_ . By default urllib identifies itself as
+to different browsers [#]_. By default urllib identifies itself as
``Python-urllib/x.y`` (where ``x`` and ``y`` are the major and minor version
numbers of the Python release,
e.g. ``Python-urllib/2.5``), which may confuse the site, or just plain
diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst
--- a/Doc/library/ctypes.rst
+++ b/Doc/library/ctypes.rst
@@ -1651,7 +1651,7 @@
WINUSERAPI int WINAPI
MessageBoxA(
- HWND hWnd ,
+ HWND hWnd,
LPCSTR lpText,
LPCSTR lpCaption,
UINT uType);
diff --git a/Doc/library/http.cookiejar.rst b/Doc/library/http.cookiejar.rst
--- a/Doc/library/http.cookiejar.rst
+++ b/Doc/library/http.cookiejar.rst
@@ -309,7 +309,7 @@
-----------------------------------------------------------
The following :class:`CookieJar` subclasses are provided for reading and
-writing .
+writing.
.. class:: MozillaCookieJar(filename, delayload=None, policy=None)
diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst
--- a/Doc/library/itertools.rst
+++ b/Doc/library/itertools.rst
@@ -56,7 +56,7 @@
:func:`islice` seq, [start,] stop [, step] elements from seq[start:stop:step] ``islice('ABCDEFG', 2, None) --> C D E F G``
:func:`starmap` func, seq func(\*seq[0]), func(\*seq[1]), ... ``starmap(pow, [(2,5), (3,2), (10,3)]) --> 32 9 1000``
:func:`takewhile` pred, seq seq[0], seq[1], until pred fails ``takewhile(lambda x: x<5, [1,4,6,4,1]) --> 1 4``
-:func:`tee` it, n it1, it2 , ... itn splits one iterator into n
+:func:`tee` it, n it1, it2, ... itn splits one iterator into n
:func:`zip_longest` p, q, ... (p[0], q[0]), (p[1], q[1]), ... ``zip_longest('ABCD', 'xy', fillvalue='-') --> Ax By C- D-``
==================== ============================ ================================================= =============================================================
@@ -131,7 +131,7 @@
>>> inputs = repeat(x0, 36) # only the initial value is used
>>> [format(x, '.2f') for x in accumulate(inputs, logistic_map)]
['0.40', '0.91', '0.30', '0.81', '0.60', '0.92', '0.29', '0.79', '0.63',
- '0.88' ,'0.39', '0.90', '0.33', '0.84', '0.52', '0.95', '0.18', '0.57',
+ '0.88', '0.39', '0.90', '0.33', '0.84', '0.52', '0.95', '0.18', '0.57',
'0.93', '0.25', '0.71', '0.79', '0.63', '0.88', '0.39', '0.91', '0.32',
'0.83', '0.54', '0.95', '0.20', '0.60', '0.91', '0.30', '0.80', '0.60']
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -809,7 +809,7 @@
---------------------
:class:`LoggerAdapter` instances are used to conveniently pass contextual
-information into logging calls. For a usage example , see the section on
+information into logging calls. For a usage example, see the section on
:ref:`adding contextual information to your logging output <context-info>`.
.. class:: LoggerAdapter(logger, extra)
diff --git a/Doc/library/ossaudiodev.rst b/Doc/library/ossaudiodev.rst
--- a/Doc/library/ossaudiodev.rst
+++ b/Doc/library/ossaudiodev.rst
@@ -49,7 +49,7 @@
the official documentation for the OSS C API
The module defines a large number of constants supplied by the OSS device
- driver; see ``<sys/soundcard.h>`` on either Linux or FreeBSD for a listing .
+ driver; see ``<sys/soundcard.h>`` on either Linux or FreeBSD for a listing.
:mod:`ossaudiodev` defines the following variables and functions:
diff --git a/Doc/library/pyexpat.rst b/Doc/library/pyexpat.rst
--- a/Doc/library/pyexpat.rst
+++ b/Doc/library/pyexpat.rst
@@ -861,5 +861,5 @@
.. [#] The encoding string included in XML output should conform to the
appropriate standards. For example, "UTF-8" is valid, but "UTF8" is
not. See http://www.w3.org/TR/2006/REC-xml11-20060816/#NT-EncodingDecl
- and http://www.iana.org/assignments/character-sets .
+ and http://www.iana.org/assignments/character-sets\ .
diff --git a/Doc/library/re.rst b/Doc/library/re.rst
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -317,7 +317,7 @@
optional and can be omitted. For example,
``(<)?(\w+@\w+(?:\.\w+)+)(?(1)>|$)`` is a poor email matching pattern, which
will match with ``'<user at host.com>'`` as well as ``'user at host.com'``, but
- not with ``'<user at host.com'`` nor ``'user at host.com>'`` .
+ not with ``'<user at host.com'`` nor ``'user at host.com>'``.
The special sequences consist of ``'\'`` and a character from the list below.
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1583,7 +1583,7 @@
.. method:: str.format_map(mapping)
Similar to ``str.format(**mapping)``, except that ``mapping`` is
- used directly and not copied to a :class:`dict` . This is useful
+ used directly and not copied to a :class:`dict`. This is useful
if for example ``mapping`` is a dict subclass:
>>> class Default(dict):
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -1221,5 +1221,5 @@
.. rubric:: Citations
-.. [C99] ISO/IEC 9899:1999. "Programming languages -- C." A public draft of this standard is available at http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf .
+.. [C99] ISO/IEC 9899:1999. "Programming languages -- C." A public draft of this standard is available at http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf\ .
diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -180,7 +180,7 @@
The Tk/Tcl development is largely taking place at ActiveState.
`Tcl and the Tk Toolkit <http://www.amazon.com/exec/obidos/ASIN/020163337X>`_
- The book by John Ousterhout, the inventor of Tcl .
+ The book by John Ousterhout, the inventor of Tcl.
`Practical Programming in Tcl and Tk <http://www.amazon.com/exec/obidos/ASIN/0130220280>`_
Brent Welch's encyclopedic book.
@@ -613,7 +613,7 @@
preceded with an ``@``, as in ``"@/usr/contrib/bitmap/gumby.bit"``.
boolean
- You can pass integers 0 or 1 or the strings ``"yes"`` or ``"no"`` .
+ You can pass integers 0 or 1 or the strings ``"yes"`` or ``"no"``.
callback
This is any Python function that takes no arguments. For example::
diff --git a/Doc/library/trace.rst b/Doc/library/trace.rst
--- a/Doc/library/trace.rst
+++ b/Doc/library/trace.rst
@@ -41,7 +41,7 @@
At least one of the following options must be specified when invoking
:mod:`trace`. The :option:`--listfuncs <-l>` option is mutually exclusive with
-the :option:`--trace <-t>` and :option:`--counts <-c>` options . When
+the :option:`--trace <-t>` and :option:`--counts <-c>` options. When
:option:`--listfuncs <-l>` is provided, neither :option:`--counts <-c>` nor
:option:`--trace <-t>` are accepted, and vice versa.
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -1055,7 +1055,7 @@
the returned bytes object to string once it determines or guesses
the appropriate encoding.
-The following W3C document, http://www.w3.org/International/O-charset , lists
+The following W3C document, http://www.w3.org/International/O-charset\ , lists
the various ways in which a (X)HTML or a XML document could have specified its
encoding information.
diff --git a/Doc/library/xml.dom.minidom.rst b/Doc/library/xml.dom.minidom.rst
--- a/Doc/library/xml.dom.minidom.rst
+++ b/Doc/library/xml.dom.minidom.rst
@@ -252,4 +252,4 @@
"UTF8" is not valid in an XML document's declaration, even though
Python accepts it as an encoding name.
See http://www.w3.org/TR/2006/REC-xml11-20060816/#NT-EncodingDecl
- and http://www.iana.org/assignments/character-sets .
+ and http://www.iana.org/assignments/character-sets\ .
diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -626,7 +626,7 @@
As mentioned previously, Python comes with several default meta path finders.
One of these, called the :term:`path based finder`
-(:class:`~importlib.machinery.PathFinder`) , searches an :term:`import path`,
+(:class:`~importlib.machinery.PathFinder`), searches an :term:`import path`,
which contains a list of :term:`path entries <path entry>`. Each path
entry names a location to search for modules.
diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -2469,7 +2469,7 @@
In addition to the existing Subversion code repository at http://svn.python.org
there is now a `Mercurial <http://mercurial.selenic.com/>`_ repository at
-http://hg.python.org/ .
+http://hg.python.org/\ .
After the 3.2 release, there are plans to switch to Mercurial as the primary
repository. This distributed version control system should make it easier for
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -194,7 +194,7 @@
are still permitted, but will always compare as unequal, regardless
of view contents.
-* For further changes see `Build and C API Changes`_ and `Porting C code`_ .
+* For further changes see `Build and C API Changes`_ and `Porting C code`_.
(Contributed by Stefan Krah in :issue:`10181`)
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -275,7 +275,7 @@
The binary and text transforms provided in the standard library are detailed
in :ref:`binary-transforms` and :ref:`text-transforms`.
-(Contributed by Nick Coghlan in :issue:`7475`, , :issue:`17827`,
+(Contributed by Nick Coghlan in :issue:`7475`, :issue:`17827`,
:issue:`17828` and :issue:`19619`)
.. _whatsnew-pep-451:
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list