Merge from 3.5

This commit is contained in:
Berker Peksag 2016-06-01 09:36:40 -07:00
commit 12a8a8a0db

View file

@ -120,7 +120,7 @@ are directly accessible:
If a name is declared global, then all references and assignments go directly to If a name is declared global, then all references and assignments go directly to
the middle scope containing the module's global names. To rebind variables the middle scope containing the module's global names. To rebind variables
found outside of the innermost scope, the :keyword:`nonlocal` statement can be found outside of the innermost scope, the :keyword:`nonlocal` statement can be
used; if not declared nonlocal, those variable are read-only (an attempt to used; if not declared nonlocal, those variables are read-only (an attempt to
write to such a variable will simply create a *new* local variable in the write to such a variable will simply create a *new* local variable in the
innermost scope, leaving the identically named outer variable unchanged). innermost scope, leaving the identically named outer variable unchanged).