diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-04-24 16:02:53 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-04-24 16:02:53 (GMT) |
| commit | 51f58059f6d5eb958201d1d90286e5917b77ed59 (patch) | |
| tree | 98faacf9c6c9c3f3215f0dc1ceebf4d1386e5f03 /Doc | |
| parent | 247789cee99c8933c140110791d136cbe37a003b (diff) | |
| parent | 9bdd61338d5a03cb2d8a677c646df20f64fef30e (diff) | |
| download | cpython-51f58059f6d5eb958201d1d90286e5917b77ed59.zip cpython-51f58059f6d5eb958201d1d90286e5917b77ed59.tar.gz cpython-51f58059f6d5eb958201d1d90286e5917b77ed59.tar.bz2 | |
merge 3.4 (#24049)
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/reference/executionmodel.rst | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Doc/reference/executionmodel.rst b/Doc/reference/executionmodel.rst index a3948e3..6309e59 100644 --- a/Doc/reference/executionmodel.rst +++ b/Doc/reference/executionmodel.rst @@ -161,10 +161,6 @@ conjunction with nested scopes that contain free variables. If a variable is referenced in an enclosing scope, it is illegal to delete the name. An error will be reported at compile time. -If the wild card form of import --- ``import *`` --- is used in a function and -the function contains or is a nested block with free variables, the compiler -will raise a :exc:`SyntaxError`. - .. XXX from * also invalid with relative imports (at least currently) The :func:`eval` and :func:`exec` functions do not have access to the full |