From: pbhd <p-bauer-schriesheim@t-online.de>
Date: Wed, 29 May 2019 03:38:03 +0000 (+0200)
Subject: bpo-36739: Update controlflow.rst (GH-12983)
X-Git-Tag: v3.8.0b1~151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1f95e77e0647aff602e0660ba3c282b71045875;p=python

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
---

diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst
index 813b7ca93c..81a28a6e53 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