mirror of
https://github.com/python/cpython.git
synced 2025-08-04 17:08:35 +00:00
Merged revisions 74779-74786,74793,74795,74811,74860-74861,74863,74876,74886,74896,74901,74903,74908,74912,74930,74933,74943,74946,74952-74955,75015,75019,75032,75068,75076,75095,75098,75102,75129,75139,75230 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r74779 | michael.foord | 2009-09-13 11:13:36 -0500 (Sun, 13 Sep 2009) | 1 line Change to tutorial wording for reading text / binary files on Windows. Issue #6301. ........ r74780 | michael.foord | 2009-09-13 11:40:02 -0500 (Sun, 13 Sep 2009) | 1 line Objects that compare equal automatically pass or fail assertAlmostEqual and assertNotAlmostEqual tests on unittest.TestCase. Issue 6567. ........ r74781 | michael.foord | 2009-09-13 11:46:19 -0500 (Sun, 13 Sep 2009) | 1 line Note that sys._getframe is not guaranteed to exist in all implementations of Python, and a corresponding note in inspect.currentframe. Issue 6712. ........ r74782 | michael.foord | 2009-09-13 12:07:46 -0500 (Sun, 13 Sep 2009) | 1 line Tutorial tweaks. Issue 6849. ........ r74783 | michael.foord | 2009-09-13 12:28:35 -0500 (Sun, 13 Sep 2009) | 1 line unittest.TestLoader.loadTestsFromName honors the loader suiteClass attribute. Issue 6866. ........ r74784 | georg.brandl | 2009-09-13 13:15:07 -0500 (Sun, 13 Sep 2009) | 1 line Typo fix. ........ r74785 | michael.foord | 2009-09-13 14:07:03 -0500 (Sun, 13 Sep 2009) | 1 line Test discovery in unittest will only attempt to import modules that are importable; i.e. their names are valid Python identifiers. If an import fails during discovery this will be recorded as an error and test discovery will continue. Issue 6568. ........ r74786 | michael.foord | 2009-09-13 14:08:18 -0500 (Sun, 13 Sep 2009) | 1 line Remove an extraneous space in unittest documentation. ........ r74793 | georg.brandl | 2009-09-14 09:50:47 -0500 (Mon, 14 Sep 2009) | 1 line #6908: fix association of hashlib hash attributes. ........ r74795 | benjamin.peterson | 2009-09-14 22:36:26 -0500 (Mon, 14 Sep 2009) | 1 line Py_SetPythonHome uses static storage #6913 ........ r74811 | georg.brandl | 2009-09-15 15:26:59 -0500 (Tue, 15 Sep 2009) | 1 line Add Armin Ronacher. ........ r74860 | benjamin.peterson | 2009-09-16 21:46:54 -0500 (Wed, 16 Sep 2009) | 1 line kill bare except ........ r74861 | benjamin.peterson | 2009-09-16 22:18:28 -0500 (Wed, 16 Sep 2009) | 1 line pep 8 defaults ........ r74863 | benjamin.peterson | 2009-09-16 22:27:33 -0500 (Wed, 16 Sep 2009) | 1 line rationalize a bit ........ r74876 | georg.brandl | 2009-09-17 11:15:53 -0500 (Thu, 17 Sep 2009) | 1 line #6932: remove paragraph that advises relying on __del__ being called. ........ r74886 | benjamin.peterson | 2009-09-17 16:33:46 -0500 (Thu, 17 Sep 2009) | 1 line use macros ........ r74896 | georg.brandl | 2009-09-18 02:22:41 -0500 (Fri, 18 Sep 2009) | 1 line #6936: for interactive use, quit() is just fine. ........ r74901 | georg.brandl | 2009-09-18 04:14:52 -0500 (Fri, 18 Sep 2009) | 1 line #6905: use better exception messages in inspect when the argument is of the wrong type. ........ r74903 | georg.brandl | 2009-09-18 04:18:27 -0500 (Fri, 18 Sep 2009) | 1 line #6938: "ident" is always a string, so use a format code which works. ........ r74908 | georg.brandl | 2009-09-18 08:57:11 -0500 (Fri, 18 Sep 2009) | 1 line Use str.format() to fix beginner's mistake with %-style string formatting. ........ r74912 | georg.brandl | 2009-09-18 11:19:56 -0500 (Fri, 18 Sep 2009) | 1 line Optimize optimization and fix method name in docstring. ........ r74930 | georg.brandl | 2009-09-18 16:21:41 -0500 (Fri, 18 Sep 2009) | 1 line #6925: rewrite docs for locals() and vars() a bit. ........ r74933 | georg.brandl | 2009-09-18 16:35:59 -0500 (Fri, 18 Sep 2009) | 1 line #6930: clarify description about byteorder handling in UTF decoder routines. ........ r74943 | georg.brandl | 2009-09-19 02:35:07 -0500 (Sat, 19 Sep 2009) | 1 line #6944: the argument to PyArg_ParseTuple should be a tuple, otherwise a SystemError is set. Also clean up another usage of PyArg_ParseTuple. ........ r74946 | georg.brandl | 2009-09-19 03:43:16 -0500 (Sat, 19 Sep 2009) | 1 line Update bug tracker reference. ........ r74952 | georg.brandl | 2009-09-19 05:42:34 -0500 (Sat, 19 Sep 2009) | 1 line #6946: fix duplicate index entries for datetime classes. ........ r74953 | georg.brandl | 2009-09-19 07:04:16 -0500 (Sat, 19 Sep 2009) | 1 line Fix references to threading.enumerate(). ........ r74954 | georg.brandl | 2009-09-19 08:13:56 -0500 (Sat, 19 Sep 2009) | 1 line Add Doug. ........ r74955 | georg.brandl | 2009-09-19 08:20:49 -0500 (Sat, 19 Sep 2009) | 1 line Add Mark Summerfield. ........ r75015 | georg.brandl | 2009-09-22 05:55:08 -0500 (Tue, 22 Sep 2009) | 1 line Fix encoding name. ........ r75019 | vinay.sajip | 2009-09-22 12:23:41 -0500 (Tue, 22 Sep 2009) | 1 line Fixed a typo, and added sections on optimization and using arbitrary objects as messages. ........ r75032 | benjamin.peterson | 2009-09-22 17:15:28 -0500 (Tue, 22 Sep 2009) | 1 line fix typos/rephrase ........ r75068 | benjamin.peterson | 2009-09-25 21:57:59 -0500 (Fri, 25 Sep 2009) | 1 line comment out ugly xxx ........ r75076 | vinay.sajip | 2009-09-26 09:53:32 -0500 (Sat, 26 Sep 2009) | 1 line Tidied up name of parameter in StreamHandler ........ r75095 | michael.foord | 2009-09-27 14:15:41 -0500 (Sun, 27 Sep 2009) | 1 line Test creation moved from TestProgram.parseArgs to TestProgram.createTests exclusively. Issue 6956. ........ r75098 | michael.foord | 2009-09-27 15:08:23 -0500 (Sun, 27 Sep 2009) | 1 line Documentation improvement for load_tests protocol in unittest. Issue 6515. ........ r75102 | skip.montanaro | 2009-09-27 21:12:27 -0500 (Sun, 27 Sep 2009) | 3 lines Patch from Thomas Barr so that csv.Sniffer will set doublequote property. Closes issue 6606. ........ r75129 | vinay.sajip | 2009-09-29 02:08:54 -0500 (Tue, 29 Sep 2009) | 1 line Issue #7014: logging: Improved IronPython 2.6 compatibility. ........ r75139 | raymond.hettinger | 2009-09-29 13:53:24 -0500 (Tue, 29 Sep 2009) | 3 lines Issue 7008: Better document str.title and show how to work around the apostrophe problem. ........ r75230 | benjamin.peterson | 2009-10-04 08:38:38 -0500 (Sun, 04 Oct 2009) | 1 line test logging ........
This commit is contained in:
Benjamin Peterson
parent
bd27aef8a0
commit
4ac9ce4f9a
35 changed files with 391 additions and 164 deletions
|
|
@ -371,6 +371,10 @@ Initialization, Finalization, and Threads
|
|||
Set the default "home" directory, that is, the location of the standard
|
||||
Python libraries. The libraries are searched in
|
||||
:file:`{home}/lib/python{version}` and :file:`{home}/lib/python{version}`.
|
||||
The argument should point to a zero-terminated character string in static
|
||||
storage whose contents will not change for the duration of the program's
|
||||
execution. No code in the Python interpreter will change the contents of
|
||||
this storage.
|
||||
|
||||
|
||||
.. cfunction:: w_char* Py_GetPythonHome()
|
||||
|
|
|
|||
|
|
@ -476,10 +476,13 @@ These are the UTF-32 codec APIs:
|
|||
*byteorder == 0: native order
|
||||
*byteorder == 1: big endian
|
||||
|
||||
and then switches if the first four bytes of the input data are a byte order mark
|
||||
(BOM) and the specified byte order is native order. This BOM is not copied into
|
||||
the resulting Unicode string. After completion, *\*byteorder* is set to the
|
||||
current byte order at the end of input data.
|
||||
If ``*byteorder`` is zero, and the first four bytes of the input data are a
|
||||
byte order mark (BOM), the decoder switches to this byte order and the BOM is
|
||||
not copied into the resulting Unicode string. If ``*byteorder`` is ``-1`` or
|
||||
``1``, any byte order mark is copied to the output.
|
||||
|
||||
After completion, *\*byteorder* is set to the current byte order at the end
|
||||
of input data.
|
||||
|
||||
In a narrow build codepoints outside the BMP will be decoded as surrogate pairs.
|
||||
|
||||
|
|
@ -500,8 +503,7 @@ These are the UTF-32 codec APIs:
|
|||
.. cfunction:: PyObject* PyUnicode_EncodeUTF32(const Py_UNICODE *s, Py_ssize_t size, const char *errors, int byteorder)
|
||||
|
||||
Return a Python bytes object holding the UTF-32 encoded value of the Unicode
|
||||
data in *s*. If *byteorder* is not ``0``, output is written according to the
|
||||
following byte order::
|
||||
data in *s*. Output is written according to the following byte order::
|
||||
|
||||
byteorder == -1: little endian
|
||||
byteorder == 0: native byte order (writes a BOM mark)
|
||||
|
|
@ -541,10 +543,14 @@ These are the UTF-16 codec APIs:
|
|||
*byteorder == 0: native order
|
||||
*byteorder == 1: big endian
|
||||
|
||||
and then switches if the first two bytes of the input data are a byte order mark
|
||||
(BOM) and the specified byte order is native order. This BOM is not copied into
|
||||
the resulting Unicode string. After completion, *\*byteorder* is set to the
|
||||
current byte order at the end of input data.
|
||||
If ``*byteorder`` is zero, and the first two bytes of the input data are a
|
||||
byte order mark (BOM), the decoder switches to this byte order and the BOM is
|
||||
not copied into the resulting Unicode string. If ``*byteorder`` is ``-1`` or
|
||||
``1``, any byte order mark is copied to the output (where it will result in
|
||||
either a ``\ufeff`` or a ``\ufffe`` character).
|
||||
|
||||
After completion, *\*byteorder* is set to the current byte order at the end
|
||||
of input data.
|
||||
|
||||
If *byteorder* is *NULL*, the codec starts in native order mode.
|
||||
|
||||
|
|
@ -563,8 +569,7 @@ These are the UTF-16 codec APIs:
|
|||
.. cfunction:: PyObject* PyUnicode_EncodeUTF16(const Py_UNICODE *s, Py_ssize_t size, const char *errors, int byteorder)
|
||||
|
||||
Return a Python bytes object holding the UTF-16 encoded value of the Unicode
|
||||
data in *s*. If *byteorder* is not ``0``, output is written according to the
|
||||
following byte order::
|
||||
data in *s*. Output is written according to the following byte order::
|
||||
|
||||
byteorder == -1: little endian
|
||||
byteorder == 0: native byte order (writes a BOM mark)
|
||||
|
|
|
|||
|
|
@ -597,8 +597,10 @@ units as well as normal text:
|
|||
An important bit of information about an API that a user should be aware of
|
||||
when using whatever bit of API the warning pertains to. The content of the
|
||||
directive should be written in complete sentences and include all appropriate
|
||||
punctuation. This should only be chosen over ``note`` for information
|
||||
regarding the possibility of crashes, data loss, or security implications.
|
||||
punctuation. In the interest of not scaring users away from pages filled
|
||||
with warnings, this directive should only be chosen over ``note`` for
|
||||
information regarding the possibility of crashes, data loss, or security
|
||||
implications.
|
||||
|
||||
.. describe:: versionadded
|
||||
|
||||
|
|
|
|||
|
|
@ -988,7 +988,7 @@ particular, the following variants typically exist:
|
|||
+-----------------+--------------------------------+--------------------------------+
|
||||
| cp1255 | windows-1255 | Hebrew |
|
||||
+-----------------+--------------------------------+--------------------------------+
|
||||
| cp1256 | windows1256 | Arabic |
|
||||
| cp1256 | windows-1256 | Arabic |
|
||||
+-----------------+--------------------------------+--------------------------------+
|
||||
| cp1257 | windows-1257 | Baltic languages |
|
||||
+-----------------+--------------------------------+--------------------------------+
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@ Available Types
|
|||
|
||||
|
||||
.. class:: date
|
||||
:noindex:
|
||||
|
||||
An idealized naive date, assuming the current Gregorian calendar always was, and
|
||||
always will be, in effect. Attributes: :attr:`year`, :attr:`month`, and
|
||||
|
|
@ -70,6 +71,7 @@ Available Types
|
|||
|
||||
|
||||
.. class:: time
|
||||
:noindex:
|
||||
|
||||
An idealized time, independent of any particular day, assuming that every day
|
||||
has exactly 24\*60\*60 seconds (there is no notion of "leap seconds" here).
|
||||
|
|
@ -78,6 +80,7 @@ Available Types
|
|||
|
||||
|
||||
.. class:: datetime
|
||||
:noindex:
|
||||
|
||||
A combination of a date and a time. Attributes: :attr:`year`, :attr:`month`,
|
||||
:attr:`day`, :attr:`hour`, :attr:`minute`, :attr:`second`, :attr:`microsecond`,
|
||||
|
|
@ -85,6 +88,7 @@ Available Types
|
|||
|
||||
|
||||
.. class:: timedelta
|
||||
:noindex:
|
||||
|
||||
A duration expressing the difference between two :class:`date`, :class:`time`,
|
||||
or :class:`datetime` instances to microsecond resolution.
|
||||
|
|
|
|||
|
|
@ -600,16 +600,12 @@ are always available. They are listed here in alphabetical order.
|
|||
.. function:: locals()
|
||||
|
||||
Update and return a dictionary representing the current local symbol table.
|
||||
Free variables are returned by :func:`locals` when it is called in function
|
||||
blocks, but not in class blocks.
|
||||
|
||||
.. note::
|
||||
|
||||
The contents of this dictionary should not be modified; changes may not
|
||||
affect the values of local variables used by the interpreter.
|
||||
|
||||
Free variables are returned by :func:`locals` when it is called in a function
|
||||
block. Modifications of free variables may not affect the values used by the
|
||||
interpreter. Free variables are not returned in class blocks.
|
||||
|
||||
affect the values of local and free variables used by the interpreter.
|
||||
|
||||
.. function:: map(function, iterable, ...)
|
||||
|
||||
|
|
@ -1176,10 +1172,10 @@ are always available. They are listed here in alphabetical order.
|
|||
|
||||
.. function:: vars([object])
|
||||
|
||||
Without arguments, return a dictionary corresponding to the current local symbol
|
||||
table. With a module, class or class instance object as argument (or anything
|
||||
else that has a :attr:`__dict__` attribute), returns a dictionary corresponding
|
||||
to the object's symbol table.
|
||||
Without an argument, act like :func:`locals`.
|
||||
|
||||
With a module, class or class instance object as argument (or anything else that
|
||||
has a :attr:`__dict__` attribute), return that attribute.
|
||||
|
||||
.. note::
|
||||
The returned dictionary should not be modified:
|
||||
|
|
|
|||
|
|
@ -86,11 +86,11 @@ The following values are provided as constant attributes of the hash objects
|
|||
returned by the constructors:
|
||||
|
||||
|
||||
.. data:: digest_size
|
||||
.. data:: hash.digest_size
|
||||
|
||||
The size of the resulting hash in bytes.
|
||||
|
||||
.. data:: block_size
|
||||
.. data:: hash.block_size
|
||||
|
||||
The internal block size of the hash algorithm in bytes.
|
||||
|
||||
|
|
|
|||
|
|
@ -508,6 +508,11 @@ line.
|
|||
|
||||
Return the frame object for the caller's stack frame.
|
||||
|
||||
This function relies on Python stack frame support in the interpreter, which
|
||||
isn't guaranteed to exist in all implementations of Python. If running in
|
||||
an implementation without Python stack frame support this function returns
|
||||
``None``.
|
||||
|
||||
|
||||
.. function:: stack(context=1)
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ default handler so that debug messages are written to a file::
|
|||
|
||||
import logging
|
||||
LOG_FILENAME = '/tmp/logging_example.out'
|
||||
logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG,)
|
||||
logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG)
|
||||
|
||||
logging.debug('This message should go to the log file')
|
||||
|
||||
|
|
@ -1493,6 +1493,55 @@ printed on the console; on the server side, you should see something like::
|
|||
69 myapp.area2 WARNING Jail zesty vixen who grabbed pay from quack.
|
||||
69 myapp.area2 ERROR The five boxing wizards jump quickly.
|
||||
|
||||
Using arbitrary objects as messages
|
||||
-----------------------------------
|
||||
|
||||
In the preceding sections and examples, it has been assumed that the message
|
||||
passed when logging the event is a string. However, this is not the only
|
||||
possibility. You can pass an arbitrary object as a message, and its
|
||||
:meth:`__str__` method will be called when the logging system needs to convert
|
||||
it to a string representation. In fact, if you want to, you can avoid
|
||||
computing a string representation altogether - for example, the
|
||||
:class:`SocketHandler` emits an event by pickling it and sending it over the
|
||||
wire.
|
||||
|
||||
Optimization
|
||||
------------
|
||||
|
||||
Formatting of message arguments is deferred until it cannot be avoided.
|
||||
However, computing the arguments passed to the logging method can also be
|
||||
expensive, and you may want to avoid doing it if the logger will just throw
|
||||
away your event. To decide what to do, you can call the :meth:`isEnabledFor`
|
||||
method which takes a level argument and returns true if the event would be
|
||||
created by the Logger for that level of call. You can write code like this::
|
||||
|
||||
if logger.isEnabledFor(logging.DEBUG):
|
||||
logger.debug("Message with %s, %s", expensive_func1(),
|
||||
expensive_func2())
|
||||
|
||||
so that if the logger's threshold is set above ``DEBUG``, the calls to
|
||||
:func:`expensive_func1` and :func:`expensive_func2` are never made.
|
||||
|
||||
There are other optimizations which can be made for specific applications which
|
||||
need more precise control over what logging information is collected. Here's a
|
||||
list of things you can do to avoid processing during logging which you don't
|
||||
need:
|
||||
|
||||
+-----------------------------------------------+----------------------------------------+
|
||||
| What you don't want to collect | How to avoid collecting it |
|
||||
+===============================================+========================================+
|
||||
| Information about where calls were made from. | Set ``logging._srcfile`` to ``None``. |
|
||||
+-----------------------------------------------+----------------------------------------+
|
||||
| Threading information. | Set ``logging.logThreads`` to ``0``. |
|
||||
+-----------------------------------------------+----------------------------------------+
|
||||
| Process information. | Set ``logging.logProcesses`` to ``0``. |
|
||||
+-----------------------------------------------+----------------------------------------+
|
||||
|
||||
Also note that the core logging module only includes the basic handlers. If
|
||||
you don't import :mod:`logging.handlers` and :mod:`logging.config`, they won't
|
||||
take up any memory.
|
||||
|
||||
.. _handler:
|
||||
|
||||
Handler Objects
|
||||
---------------
|
||||
|
|
@ -1608,9 +1657,9 @@ file-like object (or, more precisely, any object which supports :meth:`write`
|
|||
and :meth:`flush` methods).
|
||||
|
||||
|
||||
.. class:: StreamHandler(strm=None)
|
||||
.. class:: StreamHandler(stream=None)
|
||||
|
||||
Returns a new instance of the :class:`StreamHandler` class. If *strm* is
|
||||
Returns a new instance of the :class:`StreamHandler` class. If *stream* is
|
||||
specified, the instance will use it for logging output; otherwise, *sys.stderr*
|
||||
will be used.
|
||||
|
||||
|
|
|
|||
|
|
@ -27,27 +27,39 @@ lots of shared sub-objects. The keys are ordinary strings.
|
|||
|
||||
Because of Python semantics, a shelf cannot know when a mutable
|
||||
persistent-dictionary entry is modified. By default modified objects are
|
||||
written only when assigned to the shelf (see :ref:`shelve-example`). If
|
||||
the optional *writeback* parameter is set to *True*, all entries accessed
|
||||
are cached in memory, and written back at close time; this can make it
|
||||
handier to mutate mutable entries in the persistent dictionary, but, if
|
||||
many entries are accessed, it can consume vast amounts of memory for the
|
||||
cache, and it can make the close operation very slow since all accessed
|
||||
entries are written back (there is no way to determine which accessed
|
||||
entries are mutable, nor which ones were actually mutated).
|
||||
written only when assigned to the shelf (see :ref:`shelve-example`). If the
|
||||
optional *writeback* parameter is set to *True*, all entries accessed are
|
||||
cached in memory, and written back on :meth:`sync` and :meth:`close`; this
|
||||
can make it handier to mutate mutable entries in the persistent dictionary,
|
||||
but, if many entries are accessed, it can consume vast amounts of memory for
|
||||
the cache, and it can make the close operation very slow since all accessed
|
||||
entries are written back (there is no way to determine which accessed entries
|
||||
are mutable, nor which ones were actually mutated).
|
||||
|
||||
.. note::
|
||||
|
||||
Do not rely on the shelf being closed automatically; always call
|
||||
:meth:`close` explicitly when you don't need it any more, or use a
|
||||
:keyword:`with` statement with :func:`contextlib.closing`.
|
||||
|
||||
|
||||
Shelf objects support all methods supported by dictionaries. This eases the
|
||||
transition from dictionary based scripts to those requiring persistent storage.
|
||||
|
||||
One additional method is supported:
|
||||
|
||||
Two additional methods are supported:
|
||||
|
||||
.. method:: Shelf.sync()
|
||||
|
||||
Write back all entries in the cache if the shelf was opened with *writeback* set
|
||||
to *True*. Also empty the cache and synchronize the persistent dictionary on
|
||||
disk, if feasible. This is called automatically when the shelf is closed with
|
||||
:meth:`close`.
|
||||
Write back all entries in the cache if the shelf was opened with *writeback*
|
||||
set to :const:`True`. Also empty the cache and synchronize the persistent
|
||||
dictionary on disk, if feasible. This is called automatically when the shelf
|
||||
is closed with :meth:`close`.
|
||||
|
||||
.. method:: Shelf.close()
|
||||
|
||||
Synchronize and close the persistent *dict* object. Operations on a closed
|
||||
shelf will fail with a :exc:`ValueError`.
|
||||
|
||||
|
||||
.. seealso::
|
||||
|
||||
|
|
@ -71,11 +83,6 @@ Restrictions
|
|||
database should be fairly small, and in rare cases key collisions may cause
|
||||
the database to refuse updates.
|
||||
|
||||
* Depending on the implementation, closing a persistent dictionary may or may
|
||||
not be necessary to flush changes to disk. The :meth:`__del__` method of the
|
||||
:class:`Shelf` class calls the :meth:`close` method, so the programmer generally
|
||||
need not do this explicitly.
|
||||
|
||||
* The :mod:`shelve` module does not support *concurrent* read/write access to
|
||||
shelved objects. (Multiple simultaneous read accesses are safe.) When a
|
||||
program has a shelf open for writing, no other program should have it open for
|
||||
|
|
|
|||
|
|
@ -1149,6 +1149,8 @@ functions based on regular expressions.
|
|||
>>> titlecase("they're bill's friends.")
|
||||
"They're Bill's Friends."
|
||||
|
||||
For 8-bit strings, this method is locale-dependent.
|
||||
|
||||
|
||||
.. method:: str.translate(map)
|
||||
|
||||
|
|
|
|||
|
|
@ -337,12 +337,12 @@ always available.
|
|||
does not have to hold true for third-party extensions as it is implementation
|
||||
specific.
|
||||
|
||||
The *default* argument allows to define a value which will be returned
|
||||
if the object type does not provide means to retrieve the size and would
|
||||
cause a `TypeError`.
|
||||
If given, *default* will be returned if the object does not provide means to
|
||||
retrieve the size. Otherwise a `TypeError` will be raised.
|
||||
|
||||
:func:`getsizeof` calls the object's __sizeof__ method and adds an additional
|
||||
garbage collector overhead if the object is managed by the garbage collector.
|
||||
:func:`getsizeof` calls the object's ``__sizeof__`` method and adds an
|
||||
additional garbage collector overhead if the object is managed by the garbage
|
||||
collector.
|
||||
|
||||
|
||||
.. function:: _getframe([depth])
|
||||
|
|
@ -352,7 +352,8 @@ always available.
|
|||
that is deeper than the call stack, :exc:`ValueError` is raised. The default
|
||||
for *depth* is zero, returning the frame at the top of the call stack.
|
||||
|
||||
This function should be used for internal and specialized purposes only.
|
||||
This function should be used for internal and specialized purposes only. It
|
||||
is not guaranteed to exist in all implementations of Python.
|
||||
|
||||
|
||||
.. function:: getprofile()
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ technique using a separate :func:`tcgetattr` call and a :keyword:`try` ...
|
|||
:keyword:`finally` statement to ensure that the old tty attributes are restored
|
||||
exactly no matter what happens::
|
||||
|
||||
def getpass(prompt = "Password: "):
|
||||
def getpass(prompt="Password: "):
|
||||
import termios, sys
|
||||
fd = sys.stdin.fileno()
|
||||
old = termios.tcgetattr(fd)
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ This module defines the following functions and objects:
|
|||
.. function:: active_count()
|
||||
|
||||
Return the number of :class:`Thread` objects currently alive. The returned
|
||||
count is equal to the length of the list returned by :func:`enumerate`.
|
||||
count is equal to the length of the list returned by :func:`.enumerate`.
|
||||
|
||||
|
||||
.. function:: Condition()
|
||||
|
|
@ -301,7 +301,7 @@ impossible to detect the termination of alien threads.
|
|||
|
||||
Roughly, a thread is alive from the moment the :meth:`start` method
|
||||
returns until its :meth:`run` method terminates. The module function
|
||||
:func:`enumerate` returns a list of all alive threads.
|
||||
:func:`.enumerate` returns a list of all alive threads.
|
||||
|
||||
.. attribute:: daemon
|
||||
|
||||
|
|
|
|||
|
|
@ -728,6 +728,9 @@ Test cases
|
|||
compare equal, the test will fail with the explanation given by *msg*, or
|
||||
:const:`None`.
|
||||
|
||||
.. versionchanged:: 3.2
|
||||
Objects that compare equal are automatically almost equal.
|
||||
|
||||
.. deprecated:: 3.1
|
||||
:meth:`failUnlessAlmostEqual`.
|
||||
|
||||
|
|
@ -744,6 +747,9 @@ Test cases
|
|||
compare equal, the test will fail with the explanation given by *msg*, or
|
||||
:const:`None`.
|
||||
|
||||
.. versionchanged:: 3.2
|
||||
Objects that compare equal automatically fail.
|
||||
|
||||
.. deprecated:: 3.1
|
||||
:meth:`failIfAlmostEqual`.
|
||||
|
||||
|
|
@ -1244,18 +1250,23 @@ Loading and running tests
|
|||
|
||||
Find and return all test modules from the specified start directory,
|
||||
recursing into subdirectories to find them. Only test files that match
|
||||
*pattern* will be loaded. (Using shell style pattern matching.)
|
||||
*pattern* will be loaded. (Using shell style pattern matching.) Only
|
||||
module names that are importable (i.e. are valid Python identifiers) will
|
||||
be loaded.
|
||||
|
||||
All test modules must be importable from the top level of the project. If
|
||||
the start directory is not the top level directory then the top level
|
||||
directory must be specified separately.
|
||||
|
||||
If importing a module fails, for example due to a syntax error, then this
|
||||
will be recorded as a single error and discovery will continue.
|
||||
|
||||
If a test package name (directory with :file:`__init__.py`) matches the
|
||||
pattern then the package will be checked for a ``load_tests``
|
||||
function. If this exists then it will be called with *loader*, *tests*,
|
||||
*pattern*.
|
||||
|
||||
If load_tests exists then discovery does *not* recurse into the package,
|
||||
If load_tests exists then discovery does *not* recurse into the package,
|
||||
``load_tests`` is responsible for loading all tests in the package.
|
||||
|
||||
The pattern is deliberately not stored as a loader attribute so that
|
||||
|
|
@ -1263,6 +1274,7 @@ Loading and running tests
|
|||
``load_tests`` does not need to pass this argument in to
|
||||
``loader.discover()``.
|
||||
|
||||
.. versionadded:: 2.7
|
||||
|
||||
The following attributes of a :class:`TestLoader` can be configured either by
|
||||
subclassing or assignment on an instance:
|
||||
|
|
@ -1518,6 +1530,10 @@ Loading and running tests
|
|||
load_tests Protocol
|
||||
###################
|
||||
|
||||
|
||||
.. versionadded:: 2.7
|
||||
|
||||
|
||||
Modules or packages can customize how tests are loaded from them during normal
|
||||
test runs or test discovery by implementing a function called ``load_tests``.
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ command into the command prompt in a DOS box::
|
|||
Typing an end-of-file character (:kbd:`Control-D` on Unix, :kbd:`Control-Z` on
|
||||
Windows) at the primary prompt causes the interpreter to exit with a zero exit
|
||||
status. If that doesn't work, you can exit the interpreter by typing the
|
||||
following commands: ``import sys; sys.exit()``.
|
||||
following command: ``quit()``.
|
||||
|
||||
The interpreter's line-editing features usually aren't very sophisticated. On
|
||||
Unix, whoever installed the interpreter may have enabled support for the GNU
|
||||
|
|
|
|||
|
|
@ -107,6 +107,10 @@ In most cases Python programmers do not use this facility since it introduces
|
|||
an unknown set of names into the interpreter, possibly hiding some things
|
||||
you have already defined.
|
||||
|
||||
Note that in general the practice of importing ``*`` from a module or package is
|
||||
frowned upon, since it often causes poorly readable code. However, it is okay to
|
||||
use it to save typing in interactive sessions.
|
||||
|
||||
.. note::
|
||||
|
||||
For efficiency reasons, each module is only imported once per interpreter
|
||||
|
|
@ -445,14 +449,9 @@ Importing \* From a Package
|
|||
|
||||
Now what happens when the user writes ``from sound.effects import *``? Ideally,
|
||||
one would hope that this somehow goes out to the filesystem, finds which
|
||||
submodules are present in the package, and imports them all. Unfortunately,
|
||||
this operation does not work very well on Windows platforms, where the
|
||||
filesystem does not always have accurate information about the case of a
|
||||
filename. On these platforms, there is no guaranteed way to know whether a file
|
||||
:file:`ECHO.PY` should be imported as a module :mod:`echo`, :mod:`Echo` or
|
||||
:mod:`ECHO`. (For example, Windows 95 has the annoying practice of showing all
|
||||
file names with a capitalized first letter.) The DOS 8+3 filename restriction
|
||||
adds another interesting problem for long module names.
|
||||
submodules are present in the package, and imports them all. This could take a
|
||||
long time and importing sub-modules might have unwanted side-effects that should
|
||||
only happen when the sub-module is explicitly imported.
|
||||
|
||||
The only solution is for the package author to provide an explicit index of the
|
||||
package. The :keyword:`import` statement uses the following convention: if a package's
|
||||
|
|
@ -487,10 +486,9 @@ current namespace because they are defined in the :mod:`sound.effects` package
|
|||
when the ``from...import`` statement is executed. (This also works when
|
||||
``__all__`` is defined.)
|
||||
|
||||
Note that in general the practice of importing ``*`` from a module or package is
|
||||
frowned upon, since it often causes poorly readable code. However, it is okay to
|
||||
use it to save typing in interactive sessions, and certain modules are designed
|
||||
to export only names that follow certain patterns.
|
||||
Although certain modules are designed to export only names that follow certain
|
||||
patterns when you use ``import *``, it is still considered bad practise in
|
||||
production code.
|
||||
|
||||
Remember, there is nothing wrong with using ``from Package import
|
||||
specific_submodule``! In fact, this is the recommended notation unless the
|
||||
|
|
|
|||
|
|
@ -505,6 +505,13 @@ changes, or look through the Subversion logs for all the details.
|
|||
differences. :meth:`assertDictContainsSubset` checks whether
|
||||
all of the key/value pairs in *first* are found in *second*.
|
||||
|
||||
* :meth:`assertAlmostEqual` and :meth:`assertNotAlmostEqual` short-circuit
|
||||
(automatically pass or fail without checking decimal places) if the objects
|
||||
are equal.
|
||||
|
||||
* :meth:`loadTestsFromName` properly honors the ``suiteClass`` attribute of
|
||||
the :class:`TestLoader`. (Fixed by Mark Roddy; :issue:`6866`.)
|
||||
|
||||
* A new hook, :meth:`addTypeEqualityFunc` takes a type object and a
|
||||
function. The :meth:`assertEqual` method will use the function
|
||||
when both of the objects being compared are of the specified type.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue