summaryrefslogtreecommitdiff
path: root/Lib/pydoc_data/topics.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/pydoc_data/topics.py')
-rw-r--r--Lib/pydoc_data/topics.py137
1 files changed, 72 insertions, 65 deletions
diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py
index 0c307a1151..6702af73af 100644
--- a/Lib/pydoc_data/topics.py
+++ b/Lib/pydoc_data/topics.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Autogenerated by Sphinx on Tue Jun 12 00:16:23 2018
+# Autogenerated by Sphinx on Wed Sep 26 02:28:16 2018
topics = {'assert': 'The "assert" statement\n'
'**********************\n'
'\n'
@@ -985,7 +985,7 @@ topics = {'assert': 'The "assert" statement\n'
'operators:\n'
'\n'
' m_expr ::= u_expr | m_expr "*" u_expr | m_expr "@" m_expr |\n'
- ' m_expr "//" u_expr| m_expr "/" u_expr |\n'
+ ' m_expr "//" u_expr | m_expr "/" u_expr |\n'
' m_expr "%" u_expr\n'
' a_expr ::= m_expr | a_expr "+" m_expr | a_expr "-" m_expr\n'
'\n'
@@ -1505,7 +1505,7 @@ topics = {'assert': 'The "assert" statement\n'
'the\n'
'interpretation that is conventional in mathematics:\n'
'\n'
- ' comparison ::= or_expr ( comp_operator or_expr )*\n'
+ ' comparison ::= or_expr (comp_operator or_expr)*\n'
' comp_operator ::= "<" | ">" | "==" | ">=" | "<=" | "!="\n'
' | "is" ["not"] | ["not"] "in"\n'
'\n'
@@ -1956,7 +1956,7 @@ topics = {'assert': 'The "assert" statement\n'
'The "if" statement is used for conditional execution:\n'
'\n'
' if_stmt ::= "if" expression ":" suite\n'
- ' ( "elif" expression ":" suite )*\n'
+ ' ("elif" expression ":" suite)*\n'
' ["else" ":" suite]\n'
'\n'
'It selects exactly one of the suites by evaluating the '
@@ -2065,7 +2065,7 @@ topics = {'assert': 'The "assert" statement\n'
'\n'
'Note: There is a subtlety when the sequence is being modified by '
'the\n'
- ' loop (this can only occur for mutable sequences, i.e. lists). '
+ ' loop (this can only occur for mutable sequences, e.g. lists). '
'An\n'
' internal counter is used to keep track of which item is used '
'next,\n'
@@ -2361,7 +2361,8 @@ topics = {'assert': 'The "assert" statement\n'
'section The standard type hierarchy):\n'
'\n'
' funcdef ::= [decorators] "def" funcname "(" '
- '[parameter_list] ")" ["->" expression] ":" suite\n'
+ '[parameter_list] ")"\n'
+ ' ["->" expression] ":" suite\n'
' decorators ::= decorator+\n'
' decorator ::= "@" dotted_name ["(" '
'[argument_list [","]] ")"] NEWLINE\n'
@@ -2626,7 +2627,8 @@ topics = {'assert': 'The "assert" statement\n'
'-----------------------------\n'
'\n'
' async_funcdef ::= [decorators] "async" "def" funcname "(" '
- '[parameter_list] ")" ["->" expression] ":" suite\n'
+ '[parameter_list] ")"\n'
+ ' ["->" expression] ":" suite\n'
'\n'
'Execution of Python coroutines can be suspended and resumed at '
'many\n'
@@ -4063,7 +4065,7 @@ topics = {'assert': 'The "assert" statement\n'
'The "if" statement is used for conditional execution:\n'
'\n'
' if_stmt ::= "if" expression ":" suite\n'
- ' ( "elif" expression ":" suite )*\n'
+ ' ("elif" expression ":" suite)*\n'
' ["else" ":" suite]\n'
'\n'
'It selects exactly one of the suites by evaluating the expressions '
@@ -4474,10 +4476,10 @@ topics = {'assert': 'The "assert" statement\n'
'exprlists': 'Expression lists\n'
'****************\n'
'\n'
- ' expression_list ::= expression ( "," expression )* [","]\n'
- ' starred_list ::= starred_item ( "," starred_item )* '
+ ' expression_list ::= expression ("," expression)* [","]\n'
+ ' starred_list ::= starred_item ("," starred_item)* '
'[","]\n'
- ' starred_expression ::= expression | ( starred_item "," )* '
+ ' starred_expression ::= expression | (starred_item ",")* '
'[starred_item]\n'
' starred_item ::= expression | "*" or_expr\n'
'\n'
@@ -4591,7 +4593,7 @@ topics = {'assert': 'The "assert" statement\n'
':= a to b do"; e.g., "list(range(3))" returns the list "[0, 1, 2]".\n'
'\n'
'Note: There is a subtlety when the sequence is being modified by the\n'
- ' loop (this can only occur for mutable sequences, i.e. lists). An\n'
+ ' loop (this can only occur for mutable sequences, e.g. lists). An\n'
' internal counter is used to keep track of which item is used next,\n'
' and this is incremented on each iteration. When this counter has\n'
' reached the length of the sequence the loop terminates. This '
@@ -4689,7 +4691,13 @@ topics = {'assert': 'The "assert" statement\n'
'\n'
'Changed in version 3.1: The positional argument specifiers '
'can be\n'
- 'omitted, so "\'{} {}\'" is equivalent to "\'{0} {1}\'".\n'
+ 'omitted for "str.format()", so "\'{} {}\'.format(a, b)" is '
+ 'equivalent to\n'
+ '"\'{0} {1}\'.format(a, b)".\n'
+ '\n'
+ 'Changed in version 3.4: The positional argument specifiers '
+ 'can be\n'
+ 'omitted for "Formatter".\n'
'\n'
'Some simple format string examples:\n'
'\n'
@@ -5076,16 +5084,16 @@ topics = {'assert': 'The "assert" statement\n'
'character. |\n'
' '
'+-----------+------------------------------------------------------------+\n'
- ' | "\'f\'" | Fixed point. Displays the number as a '
- 'fixed-point number. |\n'
- ' | | The default precision is '
- '"6". |\n'
+ ' | "\'f\'" | Fixed-point notation. Displays the '
+ 'number as a fixed-point |\n'
+ ' | | number. The default precision is '
+ '"6". |\n'
' '
'+-----------+------------------------------------------------------------+\n'
- ' | "\'F\'" | Fixed point. Same as "\'f\'", but '
- 'converts "nan" to "NAN" |\n'
- ' | | and "inf" to '
- '"INF". |\n'
+ ' | "\'F\'" | Fixed-point notation. Same as "\'f\'", '
+ 'but converts "nan" to |\n'
+ ' | | "NAN" and "inf" to '
+ '"INF". |\n'
' '
'+-----------+------------------------------------------------------------+\n'
' | "\'g\'" | General format. For a given precision '
@@ -5312,8 +5320,7 @@ topics = {'assert': 'The "assert" statement\n'
' 3232235521\n'
' >>>\n'
' >>> width = 5\n'
- ' >>> for num in range(5,12): #doctest: '
- '+NORMALIZE_WHITESPACE\n'
+ ' >>> for num in range(5,12): \n'
" ... for base in 'dXob':\n"
" ... print('{0:{width}{base}}'.format(num, "
"base=base, width=width), end=' ')\n"
@@ -5334,7 +5341,8 @@ topics = {'assert': 'The "assert" statement\n'
'section The standard type hierarchy):\n'
'\n'
' funcdef ::= [decorators] "def" funcname "(" '
- '[parameter_list] ")" ["->" expression] ":" suite\n'
+ '[parameter_list] ")"\n'
+ ' ["->" expression] ":" suite\n'
' decorators ::= decorator+\n'
' decorator ::= "@" dotted_name ["(" '
'[argument_list [","]] ")"] NEWLINE\n'
@@ -5739,7 +5747,7 @@ topics = {'assert': 'The "assert" statement\n'
'The "if" statement is used for conditional execution:\n'
'\n'
' if_stmt ::= "if" expression ":" suite\n'
- ' ( "elif" expression ":" suite )*\n'
+ ' ("elif" expression ":" suite)*\n'
' ["else" ":" suite]\n'
'\n'
'It selects exactly one of the suites by evaluating the expressions '
@@ -5772,18 +5780,17 @@ topics = {'assert': 'The "assert" statement\n'
'import': 'The "import" statement\n'
'**********************\n'
'\n'
- ' import_stmt ::= "import" module ["as" name] ( "," module '
- '["as" name] )*\n'
+ ' import_stmt ::= "import" module ["as" identifier] ("," '
+ 'module ["as" identifier])*\n'
' | "from" relative_module "import" identifier '
- '["as" name]\n'
- ' ( "," identifier ["as" name] )*\n'
+ '["as" identifier]\n'
+ ' ("," identifier ["as" identifier])*\n'
' | "from" relative_module "import" "(" '
- 'identifier ["as" name]\n'
- ' ( "," identifier ["as" name] )* [","] ")"\n'
+ 'identifier ["as" identifier]\n'
+ ' ("," identifier ["as" identifier])* [","] ")"\n'
' | "from" module "import" "*"\n'
' module ::= (identifier ".")* identifier\n'
' relative_module ::= "."* module | "."+\n'
- ' name ::= identifier\n'
'\n'
'The basic import statement (no "from" clause) is executed in two\n'
'steps:\n'
@@ -5943,14 +5950,13 @@ topics = {'assert': 'The "assert" statement\n'
'allows use of the new features on a per-module basis before the\n'
'release in which the feature becomes standard.\n'
'\n'
- ' future_statement ::= "from" "__future__" "import" feature ["as" '
- 'name]\n'
- ' ("," feature ["as" name])*\n'
- ' | "from" "__future__" "import" "(" feature '
- '["as" name]\n'
- ' ("," feature ["as" name])* [","] ")"\n'
- ' feature ::= identifier\n'
- ' name ::= identifier\n'
+ ' future_stmt ::= "from" "__future__" "import" feature ["as" '
+ 'identifier]\n'
+ ' ("," feature ["as" identifier])*\n'
+ ' | "from" "__future__" "import" "(" feature '
+ '["as" identifier]\n'
+ ' ("," feature ["as" identifier])* [","] ")"\n'
+ ' feature ::= identifier\n'
'\n'
'A future statement must appear near the top of the module. The '
'only\n'
@@ -6915,7 +6921,7 @@ topics = {'assert': 'The "assert" statement\n'
'The\n'
'syntax is:\n'
'\n'
- ' power ::= ( await_expr | primary ) ["**" u_expr]\n'
+ ' power ::= (await_expr | primary) ["**" u_expr]\n'
'\n'
'Thus, in an unparenthesized sequence of power and unary operators, '
'the\n'
@@ -7318,7 +7324,7 @@ topics = {'assert': 'The "assert" statement\n'
'The shifting operations have lower priority than the arithmetic\n'
'operations:\n'
'\n'
- ' shift_expr ::= a_expr | shift_expr ( "<<" | ">>" ) a_expr\n'
+ ' shift_expr ::= a_expr | shift_expr ("<<" | ">>") a_expr\n'
'\n'
'These operators accept integers as arguments. They shift the '
'first\n'
@@ -9503,20 +9509,21 @@ topics = {'assert': 'The "assert" statement\n'
' formatting options that can be specified in format '
'strings.\n'
'\n'
- ' Note: When formatting a number ("int", "float", "float" '
- 'and\n'
- ' subclasses) with the "n" type (ex: '
- '"\'{:n}\'.format(1234)"), the\n'
- ' function sets temporarily the "LC_CTYPE" locale to '
- 'the\n'
- ' "LC_NUMERIC" locale to decode "decimal_point" and '
- '"thousands_sep"\n'
- ' fields of "localeconv()" if they are non-ASCII or '
- 'longer than 1\n'
- ' byte, and the "LC_NUMERIC" locale is different than '
- 'the\n'
- ' "LC_CTYPE" locale. This temporary change affects '
- 'other threads.\n'
+ ' Note: When formatting a number ("int", "float", '
+ '"complex",\n'
+ ' "decimal.Decimal" and subclasses) with the "n" type '
+ '(ex:\n'
+ ' "\'{:n}\'.format(1234)"), the function temporarily '
+ 'sets the\n'
+ ' "LC_CTYPE" locale to the "LC_NUMERIC" locale to '
+ 'decode\n'
+ ' "decimal_point" and "thousands_sep" fields of '
+ '"localeconv()" if\n'
+ ' they are non-ASCII or longer than 1 byte, and the '
+ '"LC_NUMERIC"\n'
+ ' locale is different than the "LC_CTYPE" locale. This '
+ 'temporary\n'
+ ' change affects other threads.\n'
'\n'
' Changed in version 3.6.5: When formatting a number with '
'the "n"\n'
@@ -10119,7 +10126,7 @@ topics = {'assert': 'The "assert" statement\n'
' Return a copy of the string with all the cased '
'characters [4]\n'
' converted to uppercase. Note that '
- '"str.upper().isupper()" might be\n'
+ '"s.upper().isupper()" might be\n'
' "False" if "s" contains uncased characters or if the '
'Unicode\n'
' category of the resulting character(s) is not “Lu” '
@@ -10405,9 +10412,9 @@ topics = {'assert': 'The "assert" statement\n'
'exactly one\n'
'item.)\n'
'\n'
- 'If the primary is a sequence, the expression (list) must '
- 'evaluate to\n'
- 'an integer or a slice (as discussed in the following '
+ 'If the primary is a sequence, the expression list must '
+ 'evaluate to an\n'
+ 'integer or a slice (as discussed in the following '
'section).\n'
'\n'
'The formal syntax makes no special provision for negative '
@@ -12375,13 +12382,13 @@ topics = {'assert': 'The "assert" statement\n'
'| | "s[len(s):len(s)] = '
'[x]") | |\n'
'+--------------------------------+----------------------------------+-----------------------+\n'
- '| "s.clear()" | removes all items from "s" '
+ '| "s.clear()" | removes all items from *s* '
'(same | (5) |\n'
'| | as "del '
's[:]") | |\n'
'+--------------------------------+----------------------------------+-----------------------+\n'
'| "s.copy()" | creates a shallow copy of '
- '"s" | (5) |\n'
+ '*s* | (5) |\n'
'| | (same as '
'"s[:]") | |\n'
'+--------------------------------+----------------------------------+-----------------------+\n'
@@ -12771,7 +12778,7 @@ topics = {'assert': 'The "assert" statement\n'
'\n'
' * The linspace recipe shows how to implement a lazy version '
'of\n'
- ' range that suitable for floating point applications.\n',
+ ' range suitable for floating point applications.\n',
'typesseq-mutable': 'Mutable Sequence Types\n'
'**********************\n'
'\n'
@@ -12831,12 +12838,12 @@ topics = {'assert': 'The "assert" statement\n'
'[x]") | |\n'
'+--------------------------------+----------------------------------+-----------------------+\n'
'| "s.clear()" | removes all items '
- 'from "s" (same | (5) |\n'
+ 'from *s* (same | (5) |\n'
'| | as "del '
's[:]") | |\n'
'+--------------------------------+----------------------------------+-----------------------+\n'
'| "s.copy()" | creates a shallow '
- 'copy of "s" | (5) |\n'
+ 'copy of *s* | (5) |\n'
'| | (same as '
'"s[:]") | |\n'
'+--------------------------------+----------------------------------+-----------------------+\n'