mirror of
https://github.com/python/cpython.git
synced 2025-07-24 03:35:53 +00:00
Remove duplication.
This commit is contained in:
parent
7a15390f83
commit
1e87da16ea
29 changed files with 33 additions and 33 deletions
|
@ -265,7 +265,7 @@
|
|||
# intervening. If there are other threads waiting to write, they
|
||||
# are allowed to proceed only if the current thread calls
|
||||
# .read_out; threads waiting to read are only allowed to proceed
|
||||
# if there are are no threads waiting to write. (This is a
|
||||
# if there are no threads waiting to write. (This is a
|
||||
# weakness of the interface!)
|
||||
|
||||
import thread
|
||||
|
|
|
@ -659,7 +659,7 @@ Hi,
|
|||
I have implemented a new image type called "compound". It allows you
|
||||
to glue together a bunch of bitmaps, images and text strings together
|
||||
to form a bigger image. Then you can use this image with widgets that
|
||||
support the -image option. For example, you can display a text string string
|
||||
support the -image option. For example, you can display a text string
|
||||
together with a bitmap, at the same time, inside a TK button widget.
|
||||
""")
|
||||
list.pack(expand=1, fill=Tix.BOTH, padx=4, pady=6)
|
||||
|
|
|
@ -475,7 +475,7 @@ recursion depth automatically).
|
|||
|
||||
Marks a point where a recursive C-level call is about to be performed.
|
||||
|
||||
If :const:`USE_STACKCHECK` is defined, this function checks if the the OS
|
||||
If :const:`USE_STACKCHECK` is defined, this function checks if the OS
|
||||
stack overflowed using :cfunc:`PyOS_CheckStack`. In this is the case, it
|
||||
sets a :exc:`MemoryError` and returns a nonzero value.
|
||||
|
||||
|
|
|
@ -1741,7 +1741,7 @@ Subclasses of :class:`Command` must define the following methods.
|
|||
Set final values for all the options that this command supports. This is
|
||||
always called as late as possible, ie. after any option assignments from the
|
||||
command-line or from other commands have been done. Thus, this is the place
|
||||
to to code option dependencies: if *foo* depends on *bar*, then it is safe to
|
||||
to code option dependencies: if *foo* depends on *bar*, then it is safe to
|
||||
set *foo* from *bar* as long as *foo* still has the same value it was
|
||||
assigned in :meth:`initialize_options`.
|
||||
|
||||
|
|
|
@ -679,6 +679,6 @@ and each time it reaches the size limit it is renamed with the suffix
|
|||
``.1``. Each of the existing backup files is renamed to increment the suffix
|
||||
(``.1`` becomes ``.2``, etc.) and the ``.6`` file is erased.
|
||||
|
||||
Obviously this example sets the log length much much too small as an extreme
|
||||
Obviously this example sets the log length much too small as an extreme
|
||||
example. You would want to set *maxBytes* to an appropriate value.
|
||||
|
||||
|
|
|
@ -328,7 +328,7 @@ the bytes/string dichotomy. Because Python 2 allowed the ``str`` type to hold
|
|||
textual data, people have over the years been rather loose in their delineation
|
||||
of what ``str`` instances held text compared to bytes. In Python 3 you cannot
|
||||
be so care-free anymore and need to properly handle the difference. The key
|
||||
handling this issue to to make sure that **every** string literal in your
|
||||
handling this issue to make sure that **every** string literal in your
|
||||
Python 2 code is either syntactically of functionally marked as either bytes or
|
||||
text data. After this is done you then need to make sure your APIs are designed
|
||||
to either handle a specific type or made to be properly polymorphic.
|
||||
|
|
|
@ -264,7 +264,7 @@ used for the deployment of WSGI applications.
|
|||
|
||||
* `FastCGI, SCGI, and Apache: Background and Future
|
||||
<http://www.vmunix.com/mark/blog/archives/2006/01/02/fastcgi-scgi-and-apache-background-and-future/>`_
|
||||
is a discussion on why the concept of FastCGI and SCGI is better that that
|
||||
is a discussion on why the concept of FastCGI and SCGI is better than that
|
||||
of mod_python.
|
||||
|
||||
|
||||
|
|
|
@ -188,7 +188,7 @@ counts, but the output will exclude results with counts of zero or less.
|
|||
* The multiset methods are designed only for use cases with positive values.
|
||||
The inputs may be negative or zero, but only outputs with positive values
|
||||
are created. There are no type restrictions, but the value type needs to
|
||||
support support addition, subtraction, and comparison.
|
||||
support addition, subtraction, and comparison.
|
||||
|
||||
* The :meth:`elements` method requires integer counts. It ignores zero and
|
||||
negative counts.
|
||||
|
|
|
@ -2000,7 +2000,7 @@ Utility functions
|
|||
|
||||
.. function:: string_at(address[, size])
|
||||
|
||||
This function returns the string starting at memory address address. If size
|
||||
This function returns the string starting at memory address *address*. If size
|
||||
is specified, it is used as size, otherwise the string is assumed to be
|
||||
zero-terminated.
|
||||
|
||||
|
|
|
@ -295,7 +295,7 @@ Here are the methods of the :class:`Message` class:
|
|||
|
||||
Content-Disposition: attachment; filename="bud.gif"
|
||||
|
||||
An example with with non-ASCII characters::
|
||||
An example with non-ASCII characters::
|
||||
|
||||
msg.add_header('Content-Disposition', 'attachment',
|
||||
filename=('iso-8859-1', '', 'Fußballer.ppt'))
|
||||
|
|
|
@ -196,6 +196,6 @@ Here are the classes:
|
|||
|
||||
.. versionchanged:: 2.4
|
||||
The previously deprecated *_encoding* argument has been removed. Content
|
||||
Transfer Encoding now happens happens implicitly based on the *_charset*
|
||||
Transfer Encoding now happens implicitly based on the *_charset*
|
||||
argument.
|
||||
|
||||
|
|
|
@ -452,7 +452,7 @@ HTTPConnection Objects
|
|||
Set the host and the port for HTTP Connect Tunnelling. Normally used when
|
||||
it is required to do HTTPS Conection through a proxy server.
|
||||
|
||||
The headers argument should be a mapping of extra HTTP headers to to sent
|
||||
The headers argument should be a mapping of extra HTTP headers to sent
|
||||
with the CONNECT request.
|
||||
|
||||
.. versionadded:: 2.7
|
||||
|
|
|
@ -765,7 +765,7 @@ Maildir, mbox, MH, Babyl, and MMDF.
|
|||
There is no requirement that :class:`Message` instances be used to represent
|
||||
messages retrieved using :class:`Mailbox` instances. In some situations, the
|
||||
time and memory required to generate :class:`Message` representations might
|
||||
not not acceptable. For such situations, :class:`Mailbox` instances also
|
||||
not be acceptable. For such situations, :class:`Mailbox` instances also
|
||||
offer string and file-like representations, and a custom message factory may
|
||||
be specified when a :class:`Mailbox` instance is initialized.
|
||||
|
||||
|
|
|
@ -1494,7 +1494,7 @@ itself. This means, for example, that one shared object can contain a second:
|
|||
a new shared object -- see documentation for the *method_to_typeid*
|
||||
argument of :meth:`BaseManager.register`.
|
||||
|
||||
If an exception is raised by the call, then then is re-raised by
|
||||
If an exception is raised by the call, then is re-raised by
|
||||
:meth:`_callmethod`. If some other exception is raised in the manager's
|
||||
process then this is converted into a :exc:`RemoteError` exception and is
|
||||
raised by :meth:`_callmethod`.
|
||||
|
@ -1617,7 +1617,7 @@ with the :class:`Pool` class.
|
|||
|
||||
The *chunksize* argument is the same as the one used by the :meth:`.map`
|
||||
method. For very long iterables using a large value for *chunksize* can
|
||||
make make the job complete **much** faster than using the default value of
|
||||
make the job complete **much** faster than using the default value of
|
||||
``1``.
|
||||
|
||||
Also if *chunksize* is ``1`` then the :meth:`!next` method of the iterator
|
||||
|
|
|
@ -240,7 +240,7 @@ Connection Objects
|
|||
.. method:: Connection.commit()
|
||||
|
||||
This method commits the current transaction. If you don't call this method,
|
||||
anything you did since the last call to ``commit()`` is not visible from from
|
||||
anything you did since the last call to ``commit()`` is not visible from
|
||||
other database connections. If you wonder why you don't see the data you've
|
||||
written to the database, please check you didn't forget to call this method.
|
||||
|
||||
|
|
|
@ -1311,7 +1311,7 @@ The following methods are present only on unicode objects:
|
|||
|
||||
Return ``True`` if there are only decimal characters in S, ``False``
|
||||
otherwise. Decimal characters include digit characters, and all characters
|
||||
that that can be used to form decimal-radix numbers, e.g. U+0660,
|
||||
that can be used to form decimal-radix numbers, e.g. U+0660,
|
||||
ARABIC-INDIC DIGIT ZERO.
|
||||
|
||||
|
||||
|
|
|
@ -243,7 +243,7 @@ by a colon ``':'``. These specify a non-default format for the replacement valu
|
|||
|
||||
See also the :ref:`formatspec` section.
|
||||
|
||||
The *field_name* itself begins with an *arg_name* that is either either a number or a
|
||||
The *field_name* itself begins with an *arg_name* that is either a number or a
|
||||
keyword. If it's a number, it refers to a positional argument, and if it's a keyword,
|
||||
it refers to a named keyword argument. If the numerical arg_names in a format string
|
||||
are 0, 1, 2, ... in sequence, they can all be omitted (not just some)
|
||||
|
|
|
@ -1243,7 +1243,7 @@ option. If the class name of a widget is unknown, use the method
|
|||
*layoutspec*, if specified, is expected to be a list or some other
|
||||
sequence type (excluding strings), where each item should be a tuple and
|
||||
the first item is the layout name and the second item should have the
|
||||
format described described in `Layouts`_.
|
||||
format described in `Layouts`_.
|
||||
|
||||
To understand the format, see the following example (it is not
|
||||
intended to do anything useful)::
|
||||
|
|
|
@ -470,7 +470,7 @@ value --- this is a syntactic restriction that is not expressed by the grammar.
|
|||
|
||||
**Default parameter values are evaluated when the function definition is
|
||||
executed.** This means that the expression is evaluated once, when the function
|
||||
is defined, and that that same "pre-computed" value is used for each call. This
|
||||
is defined, and that the same "pre-computed" value is used for each call. This
|
||||
is especially important to understand when a default parameter is a mutable
|
||||
object, such as a list or a dictionary: if the function modifies the object
|
||||
(e.g. by appending an item to a list), the default value is in effect modified.
|
||||
|
|
|
@ -947,7 +947,7 @@ Optimizations
|
|||
:meth:`__len__` method. (Contributed by Raymond Hettinger.)
|
||||
|
||||
* The methods :meth:`list.__getitem__`, :meth:`dict.__getitem__`, and
|
||||
:meth:`dict.__contains__` are are now implemented as :class:`method_descriptor`
|
||||
:meth:`dict.__contains__` are now implemented as :class:`method_descriptor`
|
||||
objects rather than :class:`wrapper_descriptor` objects. This form of access
|
||||
doubles their performance and makes them more suitable for use as arguments to
|
||||
functionals: ``map(mydict.__getitem__, keylist)``. (Contributed by Raymond
|
||||
|
|
|
@ -1014,7 +1014,7 @@ class DefaultCookiePolicy(CookiePolicy):
|
|||
(not erhn.startswith(".") and
|
||||
not ("."+erhn).endswith(domain))):
|
||||
_debug(" effective request-host %s (even with added "
|
||||
"initial dot) does not end end with %s",
|
||||
"initial dot) does not end with %s",
|
||||
erhn, domain)
|
||||
return False
|
||||
if (cookie.version > 0 or
|
||||
|
|
|
@ -1874,13 +1874,13 @@ class Grid(TixWidget, XView, YView):
|
|||
return self.tk.call(self, 'info', 'bbox', x, y)
|
||||
|
||||
def move_column(self, from_, to, offset):
|
||||
"""Moves the the range of columns from position FROM through TO by
|
||||
"""Moves the range of columns from position FROM through TO by
|
||||
the distance indicated by OFFSET. For example, move_column(2, 4, 1)
|
||||
moves the columns 2,3,4 to columns 3,4,5."""
|
||||
self.tk.call(self, 'move', 'column', from_, to, offset)
|
||||
|
||||
def move_row(self, from_, to, offset):
|
||||
"""Moves the the range of rows from position FROM through TO by
|
||||
"""Moves the range of rows from position FROM through TO by
|
||||
the distance indicated by OFFSET.
|
||||
For example, move_row(2, 4, 1) moves the rows 2,3,4 to rows 3,4,5."""
|
||||
self.tk.call(self, 'move', 'row', from_, to, offset)
|
||||
|
@ -1939,7 +1939,7 @@ class Grid(TixWidget, XView, YView):
|
|||
pad0 pixels
|
||||
Specifies the paddings to the top of a row.
|
||||
pad1 pixels
|
||||
Specifies the paddings to the the bottom of a row.
|
||||
Specifies the paddings to the bottom of a row.
|
||||
size val
|
||||
Specifies the height of a row.
|
||||
Val may be: "auto" -- the height of the row is set the
|
||||
|
|
|
@ -96,7 +96,7 @@ Roughly it has the following features added:
|
|||
docstrings to disc, so it can serve as a template for translations.
|
||||
|
||||
Behind the scenes there are some features included with possible
|
||||
extensions in in mind. These will be commented and documented elsewhere.
|
||||
extensions in mind. These will be commented and documented elsewhere.
|
||||
|
||||
"""
|
||||
|
||||
|
|
|
@ -958,7 +958,7 @@ _Validation_records = [
|
|||
(u'ServiceInstall',u'StartType',u'N',0,4,None, None, None, None, u'Type of the service',),
|
||||
(u'Shortcut',u'Name',u'N',None, None, None, None, u'Filename',None, u'The name of the shortcut to be created.',),
|
||||
(u'Shortcut',u'Description',u'Y',None, None, None, None, u'Text',None, u'The description for the shortcut.',),
|
||||
(u'Shortcut',u'Component_',u'N',None, None, u'Component',1,u'Identifier',None, u'Foreign key into the Component table denoting the component whose selection gates the the shortcut creation/deletion.',),
|
||||
(u'Shortcut',u'Component_',u'N',None, None, u'Component',1,u'Identifier',None, u'Foreign key into the Component table denoting the component whose selection gates the shortcut creation/deletion.',),
|
||||
(u'Shortcut',u'Icon_',u'Y',None, None, u'Icon',1,u'Identifier',None, u'Foreign key into the File table denoting the external icon file for the shortcut.',),
|
||||
(u'Shortcut',u'IconIndex',u'Y',-32767,32767,None, None, None, None, u'The icon index for the shortcut.',),
|
||||
(u'Shortcut',u'Directory_',u'N',None, None, u'Directory',1,u'Identifier',None, u'Foreign key into the Directory table denoting the directory where the shortcut file is created.',),
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
# wrapper for 'threading'.
|
||||
#
|
||||
# Try calling `multiprocessing.doc.main()` to read the html
|
||||
# documentation in in a webbrowser.
|
||||
# documentation in a webbrowser.
|
||||
#
|
||||
#
|
||||
# Copyright (c) 2006-2008, R Oudkerk
|
||||
|
|
|
@ -34,7 +34,7 @@ The optional `seekable' argument is provided as a workaround for certain stdio
|
|||
libraries in which tell() discards buffered data before discovering that the
|
||||
lseek() system call doesn't work. For maximum portability, you should set the
|
||||
seekable argument to zero to prevent that initial \code{tell} when passing in
|
||||
an unseekable object such as a a file object created from a socket object. If
|
||||
an unseekable object such as a file object created from a socket object. If
|
||||
it is 1 on entry -- which it is by default -- the tell() method of the open
|
||||
file object is called once; if this raises an exception, seekable is reset to
|
||||
0. For other nonzero values of seekable, this test is not made.
|
||||
|
|
|
@ -88,7 +88,7 @@ class scheduler:
|
|||
restarted.
|
||||
|
||||
It is legal for both the delay function and the action
|
||||
function to to modify the queue or to raise an exception;
|
||||
function to modify the queue or to raise an exception;
|
||||
exceptions are not caught but the scheduler's state remains
|
||||
well-defined so run() may be called again.
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ RFC2396_BASE = "http://a/b/c/d;p?q"
|
|||
RFC3986_BASE = 'http://a/b/c/d;p?q'
|
||||
SIMPLE_BASE = 'http://a/b/c/d'
|
||||
|
||||
# A list of test cases. Each test case is a a two-tuple that contains
|
||||
# A list of test cases. Each test case is a two-tuple that contains
|
||||
# a string with the query and a dictionary with the expected result.
|
||||
|
||||
parse_qsl_test_cases = [
|
||||
|
|
|
@ -308,7 +308,7 @@ def http_server(evt, numrequests, requestHandler=None):
|
|||
global ADDR, PORT, URL
|
||||
ADDR, PORT = serv.socket.getsockname()
|
||||
#connect to IP address directly. This avoids socket.create_connection()
|
||||
#trying to connect to to "localhost" using all address families, which
|
||||
#trying to connect to "localhost" using all address families, which
|
||||
#causes slowdown e.g. on vista which supports AF_INET6. The server listens
|
||||
#on AF_INET only.
|
||||
URL = "http://%s:%d"%(ADDR, PORT)
|
||||
|
@ -367,7 +367,7 @@ def http_multi_server(evt, numrequests, requestHandler=None):
|
|||
global ADDR, PORT, URL
|
||||
ADDR, PORT = serv.socket.getsockname()
|
||||
#connect to IP address directly. This avoids socket.create_connection()
|
||||
#trying to connect to to "localhost" using all address families, which
|
||||
#trying to connect to "localhost" using all address families, which
|
||||
#causes slowdown e.g. on vista which supports AF_INET6. The server listens
|
||||
#on AF_INET only.
|
||||
URL = "http://%s:%d"%(ADDR, PORT)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue