Merge branch 'master' of https://github.com/xinyinghou/py4e-int

Author: xinyinghou

_sources/iterations/Exercises.rst

@@ -391,7 +391,7 @@ Multiple Choice Questions
             for j in range(1,4):
                 print(i, j, end=' ')
 
-.. mchoice:: e5mc16
+.. mchoice:: e5mc16-v2
     :practice: T
     :answer_a: 1018
     :answer_b: 1009
@@ -416,8 +416,4 @@ Multiple Choice Questions
                     total += num
             return total
             
-        mystery([8, 2, 999, 5, 4])
-
-
-
-        print(mystery("walking"))
+        print(mystery([8, 2, 999, 5, 4]))

_sources/turtles/turtleFAP.rst

@@ -143,7 +143,7 @@ The program below uses the ``goto(x,y)`` to move to the top left corner before d
    :numbered: left
    :adaptive:
 
-   The following program uses a turtle to draw a capital A as shown in the picture below, but the lines are mixed up.  The program should do all necessary set-up: import the turtle module, get the screen/space to draw on, and create the turtle.  It should draw the lines in the order shown by the numbers in the picture on the left. Drag the needed blocks of statements from the left column to the right column and put them in the right order. There may be additional blocks that are not needed in a correct solution. Then click on *Check* to see if you are right. You will be told if any of the lines are in the wrong order or are the wrong blocks.
+   The following program uses a turtle to draw a capital A as shown in the picture below, but the lines are mixed up.  The program should do all necessary set-up: import the turtle module, get the screen/space to draw on, and create the turtle.  It should draw the lines in the order shown by the numbers in the picture on the left. Drag the needed blocks of statements from the left column to the right column and put them in the right order. There may be additional blocks that are not needed in a correct solution.
 
    .. image:: Figures/DrawABig.png
       :width: 240px
@@ -152,12 +152,10 @@ The program below uses the ``goto(x,y)`` to move to the top left corner before d
    from turtle import *
    =====
    space = Screen()
-   =====
-   space = screen() #paired
-   =====
    ella = Turtle()
    =====
-   ella = Turtle #paired
+   space = screen() 
+   ella = turtle() #paired
    =====
    ella.left(60)
    ella.forward(100)