summaryrefslogtreecommitdiff
path: root/Doc
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-05-28 20:48:12 -0700
committerGitHub <noreply@github.com>2019-05-28 20:48:12 -0700
commitcee95fe1825dfeb52d7074c8209b5884a079f06c (patch)
tree123718deb9172afecb896b7a0a44e82905e53015 /Doc
parent3708316afa061dc6c1c6a1207f4998974cfa0752 (diff)
downloadcpython-git-cee95fe1825dfeb52d7074c8209b5884a079f06c.tar.gz
bpo-36739: Update controlflow.rst (GH-12983)
in addition to global-statement also mention nonlocal-statement (in the paragraph describing access to variables which are non local to a function (cherry picked from commit e1f95e77e0647aff602e0660ba3c282b71045875) Co-authored-by: pbhd <p-bauer-schriesheim@t-online.de>
Diffstat (limited to 'Doc')
-rw-r--r--Doc/tutorial/controlflow.rst8
1 files changed, 5 insertions, 3 deletions
diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst
index ed42e2baaf..c3ce1205e5 100644
--- a/Doc/tutorial/controlflow.rst
+++ b/Doc/tutorial/controlflow.rst
@@ -279,9 +279,11 @@ variables of the function. More precisely, all variable assignments in a
function store the value in the local symbol table; whereas variable references
first look in the local symbol table, then in the local symbol tables of
enclosing functions, then in the global symbol table, and finally in the table
-of built-in names. Thus, global variables cannot be directly assigned a value
-within a function (unless named in a :keyword:`global` statement), although they
-may be referenced.
+of built-in names. Thus, global variables and variables of enclosing functions
+cannot be directly assigned a value within a function (unless, for global
+variables, named in a :keyword:`global` statement, or, for variables of enclosing
+functions, named in a :keyword:`nonlocal` statement), although they may be
+referenced.
The actual parameters (arguments) to a function call are introduced in the local
symbol table of the called function when it is called; thus, arguments are