Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gh-107017: removed mention that C does it the same way #107020

Merged
merged 8 commits into from
Jul 23, 2023
Merged

gh-107017: removed mention that C does it the same way #107020

Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5742c7e
removed mention that C does it the same way
JakubDotPy Jul 22, 2023
67534f2
there are no "usual" flow control statements
JakubDotPy Jul 22, 2023
a588abc
implemented suggestions
JakubDotPy Jul 22, 2023
6acff0c
fixed typo and a line length
JakubDotPy Jul 22, 2023
5d08a1b
better structuring of the "else" explanation
JakubDotPy Jul 22, 2023
e4f676a
removed links
JakubDotPy Jul 22, 2023
9c34614
added keyword formatting
JakubDotPy Jul 22, 2023
8f08838
removed link
JakubDotPy Jul 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Doc/tutorial/controlflow.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
More Control Flow Tools
***********************

Besides the :keyword:`while` statement just introduced, Python uses the usual
flow control statements known from other languages, with some twists.
As well as the :keyword:`while` statement just introduced, Python uses a few more
that we will encounter in this chapter.


.. _tut-if:
Expand Down Expand Up @@ -163,14 +163,14 @@
:keyword:`!break` and :keyword:`!continue` Statements, and :keyword:`!else` Clauses on Loops
============================================================================================

The :keyword:`break` statement, like in C, breaks out of the innermost enclosing
The :keyword:`break` statement breaks out of the innermost enclosing
:keyword:`for` or :keyword:`while` loop.

Loop statements may have an :keyword:`!else` clause; it is executed when the loop
terminates through exhaustion of the iterable (with :keyword:`for`) or when the
condition becomes false (with :keyword:`while`), but not when the loop is
terminated by a :keyword:`break` statement. This is exemplified by the
following loop, which searches for prime numbers::
The :keyword:`for` loop statements may have an extra :keyword:`!else` clause;
it is executed when the loop terminates through exhaustion of the iterable
(with :keyword:`for`) or when the condition becomes false (with :keyword:`while`),
but not when the loop is terminated by a :keyword:`break` statement.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I find the original language here rather hard to parse because the concepts are quite unfamiliar (a loop that terminates through exhaustion of an iterable...).

Perhaps:

A for or while loop can include an else clause.

In a for loop, the else clause is executed after the loop reaches its final iteration. In a while loop, it's executed after the loop's condition becomes false.

In either kind of loop, the else clause is not executed if the loop was terminated by a break.

This is exemplified by the following loop, which searches for prime numbers::
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

exemplified in


>>> for n in range(2, 10):
... for x in range(2, n):
Expand Down Expand Up @@ -520,7 +520,7 @@
:keyword:`!return` without an expression argument returns ``None``. Falling off
the end of a function also returns ``None``.

* The statement ``result.append(a)`` calls a *method* of the list object

Check warning on line 523 in Doc/tutorial/controlflow.rst

View workflow job for this annotation

GitHub Actions / Docs / Docs 

py:meth reference target not found: append
``result``. A method is a function that 'belongs' to an object and is named
``obj.methodname``, where ``obj`` is some object (this may be an expression),
and ``methodname`` is the name of a method that is defined by the object's type.
Expand Down Expand Up @@ -1039,7 +1039,7 @@
information about the types used by user-defined functions (see :pep:`3107` and
:pep:`484` for more information).

:term:`Annotations <function annotation>` are stored in the :attr:`__annotations__`

Check warning on line 1042 in Doc/tutorial/controlflow.rst

View workflow job for this annotation

GitHub Actions / Docs / Docs 

py:attr reference target not found: __annotations__
attribute of the function as a dictionary and have no effect on any other part of the
function. Parameter annotations are defined by a colon after the parameter name, followed
by an expression evaluating to the value of the annotation. Return annotations are
Expand Down
Loading