summaryrefslogtreecommitdiffstats
path: root/Doc/reference/executionmodel.rst
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2014-05-27 05:20:37 (GMT)
committerRaymond Hettinger <python@rcn.com>2014-05-27 05:20:37 (GMT)
commitaa7886dd3fd56f02a4f5ef239c869e97cbde4a57 (patch)
tree095c6b473b6389342cb377c38f26c82334b51784 /Doc/reference/executionmodel.rst
parentc7ceefc1a28a79015e6430995ad782ce2cab8a27 (diff)
downloadcpython-aa7886dd3fd56f02a4f5ef239c869e97cbde4a57.zip
cpython-aa7886dd3fd56f02a4f5ef239c869e97cbde4a57.tar.gz
cpython-aa7886dd3fd56f02a4f5ef239c869e97cbde4a57.tar.bz2
Issue 21439: Minor issues in the reference manual.
(Contributed by Feliks Kluzniak.)
Diffstat (limited to 'Doc/reference/executionmodel.rst')
-rw-r--r--Doc/reference/executionmodel.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/Doc/reference/executionmodel.rst b/Doc/reference/executionmodel.rst
index 82e37a2..664d736 100644
--- a/Doc/reference/executionmodel.rst
+++ b/Doc/reference/executionmodel.rst
@@ -31,11 +31,11 @@ that name established in the innermost function block containing the use.
A :dfn:`block` is a piece of Python program text that is executed as a unit.
The following are blocks: a module, a function body, and a class definition.
Each command typed interactively is a block. A script file (a file given as
-standard input to the interpreter or specified on the interpreter command line
-the first argument) is a code block. A script command (a command specified on
-the interpreter command line with the '**-c**' option) is a code block. The
-string argument passed to the built-in functions :func:`eval` and :func:`exec`
-is a code block.
+standard input to the interpreter or specified as a command line argument to the
+interpreter) is a code block. A script command (a command specified on the
+interpreter command line with the '**-c**' option) is a code block. The string
+argument passed to the built-in functions :func:`eval` and :func:`exec` is a
+code block.
.. index:: pair: execution; frame
@@ -77,7 +77,7 @@ global.) If a variable is used in a code block but not defined there, it is a
single: UnboundLocalError
When a name is not found at all, a :exc:`NameError` exception is raised. If the
-name refers to a local variable that has not been bound, a
+name refers to a local variable that has not been bound, an
:exc:`UnboundLocalError` exception is raised. :exc:`UnboundLocalError` is a
subclass of :exc:`NameError`.