diff options
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/library/locale.rst | 2 | ||||
-rw-r--r-- | Doc/library/multiprocessing.rst | 4 | ||||
-rw-r--r-- | Doc/library/re.rst | 2 | ||||
-rw-r--r-- | Doc/library/string.rst | 2 | ||||
-rw-r--r-- | Doc/library/warnings.rst | 14 | ||||
-rw-r--r-- | Doc/tools/sphinxext/susp-ignored.csv | 12 |
6 files changed, 25 insertions, 11 deletions
diff --git a/Doc/library/locale.rst b/Doc/library/locale.rst index 601c949..9581186 100644 --- a/Doc/library/locale.rst +++ b/Doc/library/locale.rst @@ -529,7 +529,7 @@ catalogs, and the C library's search algorithms for locating message catalogs. Python applications should normally find no need to invoke these functions, and should use :mod:`gettext` instead. A known exception to this rule are -applications that link use additional C libraries which internally invoke +applications that link with additional C libraries which internally invoke :cfunc:`gettext` or :func:`dcgettext`. For these applications, it may be necessary to bind the text domain, so that the libraries can properly locate their message catalogs. diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index c4ee87e..f726a02 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -792,9 +792,9 @@ For example: >>> a.send([1, 'hello', None]) >>> b.recv() [1, 'hello', None] - >>> b.send_bytes('thank you') + >>> b.send_bytes(b'thank you') >>> a.recv_bytes() - 'thank you' + b'thank you' >>> import array >>> arr1 = array.array('i', range(5)) >>> arr2 = array.array('i', [0] * 10) diff --git a/Doc/library/re.rst b/Doc/library/re.rst index 448bcb7..49c241d 100644 --- a/Doc/library/re.rst +++ b/Doc/library/re.rst @@ -229,7 +229,7 @@ The special characters are: undefined. ``(?:...)`` - A non-grouping version of regular parentheses. Matches whatever regular + A non-capturing version of regular parentheses. Matches whatever regular expression is inside the parentheses, but the substring matched by the group *cannot* be retrieved after performing a match or referenced later in the pattern. diff --git a/Doc/library/string.rst b/Doc/library/string.rst index 409f461..a5d11de 100644 --- a/Doc/library/string.rst +++ b/Doc/library/string.rst @@ -114,7 +114,7 @@ implementation as the built-in :meth:`format` method. Loop over the format_string and return an iterable of tuples (*literal_text*, *field_name*, *format_spec*, *conversion*). This is used - by :meth:`vformat` to break the string in to either literal text, or + by :meth:`vformat` to break the string into either literal text, or replacement fields. The values in the tuple conceptually represent a span of literal text diff --git a/Doc/library/warnings.rst b/Doc/library/warnings.rst index 36d47ad..e62be55 100644 --- a/Doc/library/warnings.rst +++ b/Doc/library/warnings.rst @@ -159,6 +159,20 @@ ImportWarning can also be enabled explicitly in Python code using:: warnings.simplefilter('default', ImportWarning) +Default Warning Filters +~~~~~~~~~~~~~~~~~~~~~~~ + +By default, Python installs several warning filters, which can be overridden by +the command-line options passed to :option:`-W` and calls to +:func:`filterwarnings`. + +* :exc:`PendingDeprecationWarning`, and :exc:`ImportWarning` are ignored. + +* :exc:`BytesWarning` is ignored unless the :option:`-b` option is given once or + twice; in this case this warning is either printed (``-b``) or turned into an + exception (``-bb``). + + .. _warning-suppress: Temporarily Suppressing Warnings diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/sphinxext/susp-ignored.csv index dffd32c..4d4db94 100644 --- a/Doc/tools/sphinxext/susp-ignored.csv +++ b/Doc/tools/sphinxext/susp-ignored.csv @@ -207,14 +207,14 @@ library/nntplib,272,:bytes,:bytes library/nntplib,272,:lines,:lines library/nntplib,272,:lines,"['xref', 'from', ':lines', ':bytes', 'references', 'date', 'message-id', 'subject']" library/nntplib,272,:bytes,"['xref', 'from', ':lines', ':bytes', 'references', 'date', 'message-id', 'subject']" -library/pickle,567,:memory,"conn = sqlite3.connect("":memory:"")" -library/profile,293,:lineno,"(sort by filename:lineno)," -library/socket,261,::,"(10, 1, 6, '', ('2001:888:2000:d::a2', 80, 0, 0))]" +library/pickle,,:memory,"conn = sqlite3.connect("":memory:"")" +library/profile,,:lineno,"(sort by filename:lineno)," +library/socket,,::,"(10, 1, 6, '', ('2001:888:2000:d::a2', 80, 0, 0))]" library/stdtypes,1026,:end,s[start:end] library/stdtypes,1195,:end,s[start:end] -library/urllib.request,64,:close,Connection:close -library/urllib.request,901,:password,"""joe:password@python.org""" -library/urllib.request,1064,:lang,"xmlns=""http://www.w3.org/1999/xhtml"" xml:lang=""en"" lang=""en"">\n\n<head>\n" +library/urllib.request,,:close,Connection:close +library/urllib.request,,:password,"""joe:password@python.org""" +library/urllib.request,,:lang,"xmlns=""http://www.w3.org/1999/xhtml"" xml:lang=""en"" lang=""en"">\n\n<head>\n" library/xmlrpc.client,103,:pass,http://user:pass@host:port/path library/xmlrpc.client,103,:port,http://user:pass@host:port/path library/xmlrpc.client,103,:pass,user:pass |