Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
6faee4e2
Commit
6faee4e2
authored
Sep 21, 2010
by
Georg Brandl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#9911: doc copyedits.
parent
af38dc5b
Changes
31
Hide whitespace changes
Inline
Side-by-side
Showing
31 changed files
with
38 additions
and
38 deletions
+38
-38
Doc/c-api/arg.rst
Doc/c-api/arg.rst
+1
-1
Doc/c-api/unicode.rst
Doc/c-api/unicode.rst
+2
-2
Doc/distutils/builtdist.rst
Doc/distutils/builtdist.rst
+1
-1
Doc/extending/newtypes.rst
Doc/extending/newtypes.rst
+1
-1
Doc/faq/design.rst
Doc/faq/design.rst
+1
-1
Doc/faq/programming.rst
Doc/faq/programming.rst
+1
-1
Doc/glossary.rst
Doc/glossary.rst
+1
-1
Doc/howto/descriptor.rst
Doc/howto/descriptor.rst
+1
-1
Doc/howto/sockets.rst
Doc/howto/sockets.rst
+1
-1
Doc/library/2to3.rst
Doc/library/2to3.rst
+1
-1
Doc/library/_thread.rst
Doc/library/_thread.rst
+1
-1
Doc/library/bisect.rst
Doc/library/bisect.rst
+1
-1
Doc/library/concurrent.futures.rst
Doc/library/concurrent.futures.rst
+2
-2
Doc/library/configparser.rst
Doc/library/configparser.rst
+1
-1
Doc/library/http.cookies.rst
Doc/library/http.cookies.rst
+1
-1
Doc/library/importlib.rst
Doc/library/importlib.rst
+1
-1
Doc/library/logging.rst
Doc/library/logging.rst
+1
-1
Doc/library/multiprocessing.rst
Doc/library/multiprocessing.rst
+1
-1
Doc/library/os.rst
Doc/library/os.rst
+1
-1
Doc/library/pickle.rst
Doc/library/pickle.rst
+4
-4
Doc/library/profile.rst
Doc/library/profile.rst
+1
-1
Doc/library/readline.rst
Doc/library/readline.rst
+1
-1
Doc/library/telnetlib.rst
Doc/library/telnetlib.rst
+1
-1
Doc/library/threading.rst
Doc/library/threading.rst
+1
-1
Doc/library/tkinter.tix.rst
Doc/library/tkinter.tix.rst
+1
-1
Doc/library/turtle.rst
Doc/library/turtle.rst
+1
-1
Doc/library/unittest.rst
Doc/library/unittest.rst
+3
-3
Doc/library/urllib.parse.rst
Doc/library/urllib.parse.rst
+1
-1
Doc/library/winreg.rst
Doc/library/winreg.rst
+1
-1
Doc/reference/expressions.rst
Doc/reference/expressions.rst
+1
-1
Doc/whatsnew/3.1.rst
Doc/whatsnew/3.1.rst
+1
-1
No files found.
Doc/c-api/arg.rst
View file @
6faee4e2
...
...
@@ -65,7 +65,7 @@ Unless otherwise stated, buffers are not NUL-terminated.
.. note::
This format does not accept bytes-like objects. If you want to accept
filesystem paths and convert them to C character strings, it is
prefer
r
able to use the ``O&`` format with :cfunc:`PyUnicode_FSConverter`
preferable to use the ``O&`` format with :cfunc:`PyUnicode_FSConverter`
as *converter*.
``s*`` (:class:`str`, :class:`bytes`, :class:`bytearray` or buffer compatible object) [Py_buffer]
...
...
Doc/c-api/unicode.rst
View file @
6faee4e2
...
...
@@ -385,7 +385,7 @@ To encode and decode file names and other environment strings,
:cdata:`Py_FileSystemEncoding` should be used as the encoding, and
``"surrogateescape"`` should be used as the error handler (:pep:`383`). To
encode file names during argument parsing, the ``"O&"`` converter should be
used, pass
s
ing :cfunc:`PyUnicode_FSConverter` as the conversion function:
used, passing :cfunc:`PyUnicode_FSConverter` as the conversion function:
.. cfunction:: int PyUnicode_FSConverter(PyObject* obj, void* result)
...
...
@@ -398,7 +398,7 @@ used, passsing :cfunc:`PyUnicode_FSConverter` as the conversion function:
To decode file names during argument parsing, the ``"O&"`` converter should be
used, pass
s
ing :cfunc:`PyUnicode_FSDecoder` as the conversion function:
used, passing :cfunc:`PyUnicode_FSDecoder` as the conversion function:
.. cfunction:: int PyUnicode_FSDecoder(PyObject* obj, void* result)
...
...
Doc/distutils/builtdist.rst
View file @
6faee4e2
...
...
@@ -357,7 +357,7 @@ would create a 64bit installation executable on your 32bit version of Windows.
To cross-compile, you must download the Python source code and cross-compile
Python itself for the platform you are targetting - it is not possible from a
binary installtion of Python (as the .lib etc file for other platforms are
binary install
a
tion of Python (as the .lib etc file for other platforms are
not included.) In practice, this means the user of a 32 bit operating
system will need to use Visual Studio 2008 to open the
:file:`PCBuild/PCbuild.sln` solution in the Python source tree and build the
...
...
Doc/extending/newtypes.rst
View file @
6faee4e2
...
...
@@ -1249,7 +1249,7 @@ This function is called with two Python objects and the operator as arguments,
where the operator is one of ``Py_EQ``, ``Py_NE``, ``Py_LE``, ``Py_GT``,
``Py_LT`` or ``Py_GT``. It should compare the two objects with respect to the
specified operator and return ``Py_True`` or ``Py_False`` if the comparison is
successful
l
, ``Py_NotImplemented`` to indicate that comparison is not
successful, ``Py_NotImplemented`` to indicate that comparison is not
implemented and the other object's comparison method should be tried, or *NULL*
if an exception was set.
...
...
Doc/faq/design.rst
View file @
6faee4e2
...
...
@@ -28,7 +28,7 @@ coding-style conflicts. In C there are many different ways to place the braces.
If you're used to reading and writing code that uses one style, you will feel at
least slightly uneasy when reading (or being required to write) another style.
Many coding styles place begin/end brackets on a line by themsel
f
. This makes
Many coding styles place begin/end brackets on a line by themsel
ves
. This makes
programs considerably longer and wastes valuable screen space, making it harder
to get a good overview of a program. Ideally, a function should fit on one
screen (say, 20-30 lines). 20 lines of Python can do a lot more work than 20
...
...
Doc/faq/programming.rst
View file @
6faee4e2
...
...
@@ -953,7 +953,7 @@ Is there an equivalent to Perl's chomp() for removing trailing newlines from str
-------------------------------------------------------------------------------------
Starting with Python 2.2, you can use ``S.rstrip("\r\n")`` to remove all
occurences of any line terminator from the end of the string ``S`` without
occur
r
ences of any line terminator from the end of the string ``S`` without
removing other trailing whitespace. If the string ``S`` represents more than
one line, with several empty lines at the end, the line terminators for all the
blank lines will be removed::
...
...
Doc/glossary.rst
View file @
6faee4e2
...
...
@@ -19,7 +19,7 @@ Glossary
2to3
A tool that tries to convert Python 2.x code to Python 3.x code by
handling most of the incompatibilites which can be detected by parsing the
handling most of the incompatibilit
i
es which can be detected by parsing the
source and traversing the parse tree.
2to3 is available in the standard library as :mod:`lib2to3`; a standalone
...
...
Doc/howto/descriptor.rst
View file @
6faee4e2
...
...
@@ -296,7 +296,7 @@ Running the interpreter shows how the function descriptor works in practice::
<bound method D.f of <__main__.D object at 0x00B18C90>>
The output suggests that bound and unbound methods are two different types.
While they could have been implemented that way, the actual C implemention of
While they could have been implemented that way, the actual C implement
at
ion of
:ctype:`PyMethod_Type` in
`Objects/classobject.c <http://svn.python.org/view/python/trunk/Objects/classobject.c?view=markup>`_
is a single object with two different representations depending on whether the
...
...
Doc/howto/sockets.rst
View file @
6faee4e2
...
...
@@ -313,7 +313,7 @@ process is likely to be screwed up.
Non-blocking Sockets
====================
If you've understood the prece
e
ding, you already know most of what you need to
If you've understood the preceding, you already know most of what you need to
know about the mechanics of using sockets. You'll still use the same calls, in
much the same ways. It's just that, if you do it right, your app will be almost
inside-out.
...
...
Doc/library/2to3.rst
View file @
6faee4e2
...
...
@@ -89,7 +89,7 @@ process.
Since some print statements can be parsed as function calls or statements, 2to3
cannot always read files containing the print function. When 2to3 detects the
presence of the ``from __future__ import print_function`` compiler directive, it
modifies its internal grammar to interp
er
t :func:`print` as a function. This
modifies its internal grammar to interp
re
t :func:`print` as a function. This
change can also be enabled manually with the :option:`-p` flag. Use
:option:`-p` to run fixers on code that already has had its print statements
converted.
...
...
Doc/library/_thread.rst
View file @
6faee4e2
...
...
@@ -106,7 +106,7 @@ It defines the following constants and functions:
.. data:: TIMEOUT_MAX
The maximum value allowed for the *timeout* parameter of
:meth:`Lock.acquire`. Specif
i
ying a timeout greater than this value will
:meth:`Lock.acquire`. Specifying a timeout greater than this value will
raise an :exc:`OverflowError`.
.. versionadded:: 3.2
...
...
Doc/library/bisect.rst
View file @
6faee4e2
...
...
@@ -125,7 +125,7 @@ a 'B', and so on::
Unlike the :func:`sorted` function, it does not make sense for the :func:`bisect`
functions to have *key* or *reversed* arguments because that would lead to an
inefficent design (successive calls to bisect functions would not "remember"
ineffic
i
ent design (successive calls to bisect functions would not "remember"
all of the previous key lookups).
Instead, it is better to search a list of precomputed keys to find the index
...
...
Doc/library/concurrent.futures.rst
View file @
6faee4e2
...
...
@@ -204,12 +204,12 @@ ProcessPoolExecutor Example
Future Objects
--------------
The :class:`Future` class encapulates the asynchronous execution of a callable.
The :class:`Future` class encap
s
ulates the asynchronous execution of a callable.
:class:`Future` instances are created by :meth:`Executor.submit`.
.. class:: Future
Encapulates the asynchronous execution of a callable. :class:`Future`
Encap
s
ulates the asynchronous execution of a callable. :class:`Future`
instances are created by :meth:`Executor.submit` and should not be created
directly except for testing.
...
...
Doc/library/configparser.rst
View file @
6faee4e2
...
...
@@ -30,7 +30,7 @@ A configuration file consists of sections, each led by a ``[section]`` header,
followed by key/value entries separated by a specific string (``=`` or ``:`` by
default). By default, section names are case sensitive but keys are not. Leading
und trailing whitespace is removed from keys and from values. Values can be
om
m
itted, in which case the key/value delimiter may also be left out. Values
omitted, in which case the key/value delimiter may also be left out. Values
can also span multiple lines, as long as they are indented deeper than the first
line of the value. Depending on the parser's mode, blank lines may be treated
as parts of multiline values or ignored.
...
...
Doc/library/http.cookies.rst
View file @
6faee4e2
...
...
@@ -125,7 +125,7 @@ Morsel Objects
* ``version``
* ``httponly``
The attribute :attr:`httponly` specifies that the cookie is only transfered
The attribute :attr:`httponly` specifies that the cookie is only transfer
r
ed
in HTTP requests, and is not accessible through JavaScript. This is intended
to mitigate some forms of cross-site scripting.
...
...
Doc/library/importlib.rst
View file @
6faee4e2
...
...
@@ -286,7 +286,7 @@ are also provided to help in implementing the core ABCs.
.. deprecated:: 3.2
This class has been deprecated in favor of :class:`SourceLoader` and is
slated for removal in Python 3.4. See below for how to create a
subclass that is compat
bi
le with Python 3.1 onwards.
subclass that is compat
ib
le with Python 3.1 onwards.
If compatibility with Python 3.1 is required, then use the following idiom
to implement a subclass that will work with Python 3.1 onwards (make sure
...
...
Doc/library/logging.rst
View file @
6faee4e2
...
...
@@ -2904,7 +2904,7 @@ wire).
.. attribute:: exc_info
Exception tuple (à la `sys.exc_info`) or `None` if no exception
information is availble.
information is avail
a
ble.
.. attribute:: func
...
...
Doc/library/multiprocessing.rst
View file @
6faee4e2
...
...
@@ -374,7 +374,7 @@ The :mod:`multiprocessing` package mostly replicates the API of the
Otherwise a daemonic process would leave its children orphaned if it gets
terminated when its parent process exits. Additionally, these are **not**
Unix daemons or services, they are normal processes that will be
terminated (and not joined) if non-da
me
onic processes have exited.
terminated (and not joined) if non-da
em
onic processes have exited.
In addition to the :class:`Threading.Thread` API, :class:`Process` objects
also support the following attributes and methods:
...
...
Doc/library/os.rst
View file @
6faee4e2
...
...
@@ -429,7 +429,7 @@ process and user.
Set the current process's real, effective, and saved user ids.
Avail
i
bility: Unix.
Avail
a
bility: Unix.
.. versionadded:: 3.2
...
...
Doc/library/pickle.rst
View file @
6faee4e2
...
...
@@ -197,7 +197,7 @@ process more convenient:
that meets this interface.
Optional keyword arguments are *fix_imports*, *encoding* and *errors*,
which are used to control compatiblity support for pickle stream generated
which are used to control compatib
i
lity support for pickle stream generated
by Python 2.x. If *fix_imports* is True, pickle will try to map the old
Python 2.x names to the new names used in Python 3.x. The *encoding* and
*errors* tell pickle how to decode 8-bit string instances pickled by Python
...
...
@@ -213,7 +213,7 @@ process more convenient:
ignored.
Optional keyword arguments are *fix_imports*, *encoding* and *errors*,
which are used to control compatiblity support for pickle stream generated
which are used to control compatib
i
lity support for pickle stream generated
by Python 2.x. If *fix_imports* is True, pickle will try to map the old
Python 2.x names to the new names used in Python 3.x. The *encoding* and
*errors* tell pickle how to decode 8-bit string instances pickled by Python
...
...
@@ -310,7 +310,7 @@ The :mod:`pickle` module exports two classes, :class:`Pickler` and
that meets this interface.
Optional keyword arguments are *fix_imports*, *encoding* and *errors*,
which are used to control compatiblity support for pickle stream generated
which are used to control compatib
i
lity support for pickle stream generated
by Python 2.x. If *fix_imports* is True, pickle will try to map the old
Python 2.x names to the new names used in Python 3.x. The *encoding* and
*errors* tell pickle how to decode 8-bit string instances pickled by Python
...
...
@@ -429,7 +429,7 @@ implementation of this behaviour::
.. index:: single: __getnewargs__() (copy protocol)
Classes can alter the default behaviour by providing one or several
s
special
Classes can alter the default behaviour by providing one or several special
methods. In protocol 2 and newer, classes that implements the
:meth:`__getnewargs__` method can dictate the values passed to the
:meth:`__new__` method upon unpickling. This is often needed for classes
...
...
Doc/library/profile.rst
View file @
6faee4e2
...
...
@@ -599,7 +599,7 @@ The resulting profiler will then call :func:`your_time_func`.
integers, you can also invoke the class constructor with a second argument
specifying the real duration of one unit of time. For example, if
:func:`your_integer_time_func` returns times measured in thousands of seconds,
you would constuct the :class:`Profile` instance as follows::
you would const
r
uct the :class:`Profile` instance as follows::
pr = profile.Profile(your_integer_time_func, 0.001)
...
...
Doc/library/readline.rst
View file @
6faee4e2
...
...
@@ -20,7 +20,7 @@ function.
the ``libedit`` library instead of GNU readline.
The configuration file for ``libedit`` is different from that
of GNU readline. If you programmaticly load configuration strings
of GNU readline. If you programmatic
al
ly load configuration strings
you can check for the text "libedit" in :const:`readline.__doc__`
to differentiate between GNU readline and libedit.
...
...
Doc/library/telnetlib.rst
View file @
6faee4e2
...
...
@@ -191,7 +191,7 @@ Telnet Objects
If a regular expression ends with a greedy match (such as ``.*``) or if more
than one expression can match the same input, the results are
in
deterministic, and may depend on the I/O timing.
non-
deterministic, and may depend on the I/O timing.
.. method:: Telnet.set_option_negotiation_callback(callback)
...
...
Doc/library/threading.rst
View file @
6faee4e2
...
...
@@ -177,7 +177,7 @@ This module also defines the following constant:
The maximum value allowed for the *timeout* parameter of blocking functions
(:meth:`Lock.acquire`, :meth:`RLock.acquire`, :meth:`Condition.wait`, etc.).
Specif
i
ying a timeout greater than this value will raise an
Specifying a timeout greater than this value will raise an
:exc:`OverflowError`.
.. versionadded:: 3.2
...
...
Doc/library/tkinter.tix.rst
View file @
6faee4e2
...
...
@@ -122,7 +122,7 @@ Basic Widgets
The `ComboBox
<http://tix.sourceforge.net/dist/current/man/html/TixCmd/tixComboBox.htm>`_
widget is similar to the combo box control in MS Windows. The user can select a
choice by either typing in the entry subwdget or selecting from the listbox
choice by either typing in the entry subw
i
dget or selecting from the listbox
subwidget.
.. Python Demo of:
...
...
Doc/library/turtle.rst
View file @
6faee4e2
...
...
@@ -1957,7 +1957,7 @@ Methods specific to Screen, not inherited from TurtleScreen
.. function:: setup(width=_CFG["width"], height=_CFG["height"], startx=_CFG["leftright"], starty=_CFG["topbottom"])
Set the size and position of the main window. Default values of arguments
are stored in the configuration dicionary and can be changed via a
are stored in the configuration dic
t
ionary and can be changed via a
:file:`turtle.cfg` file.
:param width: if an integer, a size in pixels, if a float, a fraction of the
...
...
Doc/library/unittest.rst
View file @
6faee4e2
...
...
@@ -632,7 +632,7 @@ The following decorators implement test skipping and expected failures:
.. decorator:: skipUnless(condition, reason)
Skip the decorat
or
ed test unless *condition* is true.
Skip the decorated test unless *condition* is true.
.. decorator:: expectedFailure
...
...
@@ -1598,8 +1598,8 @@ a
.. attribute:: expectedFailures
A list contaning 2-tuples of :class:`TestCase` instances and strings
holding formatted tracebacks. Each tuple represents a
expected failures
A list conta
i
ning 2-tuples of :class:`TestCase` instances and strings
holding formatted tracebacks. Each tuple represents a
n expected failure
of the test case.
.. attribute:: unexpectedSuccesses
...
...
Doc/library/urllib.parse.rst
View file @
6faee4e2
...
...
@@ -357,7 +357,7 @@ The :mod:`urllib.parse` module defines the following functions:
:rfc:`3986` - Uniform Resource Identifiers
This is the current standard (STD66). Any changes to urlparse module
should conform to this. Certain deviations could be observed, which are
mostly
due backward compatib
lity purposes and for certain de-facto
mostly
for backward compatibi
lity purposes and for certain de-facto
parsing requirements as commonly observed in major browsers.
:rfc:`2732` - Format for Literal IPv6 Addresses in URL's.
...
...
Doc/library/winreg.rst
View file @
6faee4e2
...
...
@@ -568,7 +568,7 @@ For more information, see `Registry Key Security and Access
64-bit Specific
***************
For more information, see `Accesing an Alternate Registry View
For more information, see `Acces
s
ing an Alternate Registry View
<http://msdn.microsoft.com/en-us/library/aa384129(v=VS.85).aspx>`__.
.. data:: KEY_WOW64_64KEY
...
...
Doc/reference/expressions.rst
View file @
6faee4e2
...
...
@@ -344,7 +344,7 @@ All of this makes generator functions quite similar to coroutines; they yield
multiple times, they have more than one entry point and their execution can be
suspended. The only difference is that a generator function cannot control
where should the execution continue after it yields; the control is always
transfered to the generator's caller.
transfer
r
ed to the generator's caller.
The :keyword:`yield` statement is allowed in the :keyword:`try` clause of a
:keyword:`try` ... :keyword:`finally` construct. If the generator is not
...
...
Doc/whatsnew/3.1.rst
View file @
6faee4e2
...
...
@@ -330,7 +330,7 @@ New, Improved, and Deprecated Modules
* :class:`functools.partial` objects can now be pickled.
(Suggested by Antoine Pitrou and Jesse Noller. Implemented by
Jack Diedrich; :issue:`5228`.)
Jack Died
e
rich; :issue:`5228`.)
* Add :mod:`pydoc` help topics for symbols so that ``help('@')``
works as expected in the interactive environment.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment